diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 10:51:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-02 10:51:28 -0700 |
| commit | c150d66bd514b21a8d0c4da063d77fb7bf1ecc4b (patch) | |
| tree | 8a9c4cdf74d0b36bbef71a3a6c6a90ed93c46626 /security/integrity/ima/ima_api.c | |
| parent | 61f90a8e8068c1176593858df9daf02b430fb4d7 (diff) | |
| parent | 32ba540f3c2a7ef61ed5a577ce25069a3d714fc9 (diff) | |
| download | linux-c150d66bd514b21a8d0c4da063d77fb7bf1ecc4b.tar.gz linux-c150d66bd514b21a8d0c4da063d77fb7bf1ecc4b.tar.bz2 linux-c150d66bd514b21a8d0c4da063d77fb7bf1ecc4b.zip | |
Merge tag 'integrity-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity
Pull integrity subsystem updates from Mimi Zohar:
"Other than the new gid IMA policy rule support and the RCU locking
fix, the couple of remaining changes are minor/trivial (e.g.
__ro_after_init, replacing strscpy)"
* tag 'integrity-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity:
evm: mark evm_fixmode as __ro_after_init
ima: Use strscpy instead of strlcpy
ima_policy: Remove duplicate 'the' in docs comment
ima: add gid support
ima: fix uid code style problems
ima: fix deadlock when traversing "ima_default_rules".
Diffstat (limited to 'security/integrity/ima/ima_api.c')
| -rw-r--r-- | security/integrity/ima/ima_api.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c index 2c6c3a5228b5..a64fb0130b01 100644 --- a/security/integrity/ima/ima_api.c +++ b/security/integrity/ima/ima_api.c @@ -403,7 +403,7 @@ const char *ima_d_path(const struct path *path, char **pathbuf, char *namebuf) } if (!pathname) { - strlcpy(namebuf, path->dentry->d_name.name, NAME_MAX); + strscpy(namebuf, path->dentry->d_name.name, NAME_MAX); pathname = namebuf; } |