torvalds/linux
3
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-03-22 07:27:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

apparmor: Replace deprecated strcpy in d_namespace_path

Browse Source 
strcpy() is deprecated; replace it with a direct '/' assignment. The
buffer is already NUL-terminated, so there is no need to copy an
additional NUL terminator as strcpy() did.

Update the comment and add the local variable 'is_root' for clarity.

Closes: https://github.com/KSPP/linux/issues/88
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Signed-off-by: John Johansen <john.johansen@canonical.com>
This commit is contained in:
Thorsten Blum
2025-11-06 15:51:38 +01:00
committed by John Johansen
parent b31d3f7385
commit 93d4dbdc8d
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
security/apparmor/path.c
View File

@@ -164,12 +164,15 @@ static int d_namespace_path(const struct path *path, char *buf, char **name,
}
out:
/*
* Append "/" to the pathname. The root directory is a special
* case; it already ends in slash.
/* Append "/" to directory paths, except for root "/" which
* already ends in a slash.
*/
if (!error && isdir && ((*name)[1] != '\0' || (*name)[0] != '/'))
strcpy(&buf[aa_g_path_max - 2], "/");
if (!error && isdir) {
bool is_root = (*name)[0] == '/' && (*name)[1] == '\0';
if (!is_root)
buf[aa_g_path_max - 2] = '/';
}
return error;
}