aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-10-06 17:42:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2022-10-06 17:42:29 -0700
commit7f198ba7ae9874c64ffe8cd3aa60cf5dab78ce3a (patch)
tree95cd7ccdbc0f0c5e2cade2206fe34b467c772611 /fs
parentMerge tag 'for-6.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux (diff)
parentaffs: move from strlcpy with unused retval to strscpy (diff)
downloadlinux-dev-7f198ba7ae9874c64ffe8cd3aa60cf5dab78ce3a.tar.xz
linux-dev-7f198ba7ae9874c64ffe8cd3aa60cf5dab78ce3a.zip
Merge tag 'affs-for-6.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
Pull affs update from David Sterba: "One minor update for AFFS, switching away from strlcpy" * tag 'affs-for-6.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux: affs: move from strlcpy with unused retval to strscpy
Diffstat (limited to 'fs')
-rw-r--r--fs/affs/super.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/affs/super.c b/fs/affs/super.c
index 4c5f30a83336..58b391446ae1 100644
--- a/fs/affs/super.c
+++ b/fs/affs/super.c
@@ -276,7 +276,7 @@ parse_options(char *options, kuid_t *uid, kgid_t *gid, int *mode, int *reserved,
char *vol = match_strdup(&args[0]);
if (!vol)
return 0;
- strlcpy(volume, vol, 32);
+ strscpy(volume, vol, 32);
kfree(vol);
break;
}