diff options
| author | Thorsten Blum <thorsten.blum@linux.dev> | 2025-11-06 15:51:38 +0100 |
|---|---|---|
| committer | John Johansen <john.johansen@canonical.com> | 2026-01-18 06:53:18 -0800 |
| commit | 93d4dbdc8da0b8a3ba86f4a08868084f8da872e1 (patch) | |
| tree | 9054aac748cc60345ff630eee0abd80f8e12a271 | |
| parent | b31d3f7385fbb49681d44e7104cfa033cba4b1e8 (diff) | |
apparmor: Replace deprecated strcpy in d_namespace_path
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>
| -rw-r--r-- | security/apparmor/path.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/security/apparmor/path.c b/security/apparmor/path.c index d6c74c357ffd..65a0ca5cc1bd 100644 --- a/security/apparmor/path.c +++ b/security/apparmor/path.c @@ -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; } |