diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-14 18:14:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-10-14 18:14:48 -0700 |
commit | 91080ab38f3eaa2a0af4888220d007698a2e7b03 (patch) | |
tree | ea44660d4d3d944ad92d9e2119eae9ea610979c9 /fs | |
parent | 73344a3f6793d6b5384077be1e5ce6b90bbcaeb4 (diff) | |
parent | 193cb8372424184dde28088a4230a5fed0afb0ad (diff) | |
download | linux-stable-91080ab38f3eaa2a0af4888220d007698a2e7b03.tar.gz linux-stable-91080ab38f3eaa2a0af4888220d007698a2e7b03.tar.bz2 linux-stable-91080ab38f3eaa2a0af4888220d007698a2e7b03.zip |
Merge tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux
Pull UML updates from Richard Weinberger:
- Move to strscpy()
- Improve panic notifiers
- Fix NR_CPUS usage
- Fixes for various comments
- Fixes for virtio driver
* tag 'for-linus-6.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux:
uml: Remove the initialization of statics to 0
um: Do not initialise statics to 0.
um: Fix comment typo
um: Improve panic notifiers consistency and ordering
um: remove unused reactivate_chan() declaration
um: mmaper: add __exit annotations to module exit funcs
um: virt-pci: add __init/__exit annotations to module init/exit funcs
hostfs: move from strlcpy with unused retval to strscpy
um: move from strlcpy with unused retval to strscpy
um: increase default virtual physical memory to 64 MiB
UM: cpuinfo: Fix a warning for CONFIG_CPUMASK_OFFSTACK
um: read multiple msg from virtio slave request fd
Diffstat (limited to 'fs')
-rw-r--r-- | fs/hostfs/hostfs_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/hostfs/hostfs_kern.c b/fs/hostfs/hostfs_kern.c index 07881b76d42f..277468783fee 100644 --- a/fs/hostfs/hostfs_kern.c +++ b/fs/hostfs/hostfs_kern.c @@ -103,7 +103,7 @@ static char *__dentry_name(struct dentry *dentry, char *name) */ BUG_ON(p + strlen(p) + 1 != name + PATH_MAX); - strlcpy(name, root, PATH_MAX); + strscpy(name, root, PATH_MAX); if (len > p - name) { __putname(name); return NULL; |