Merge tag 'affs-for-6.1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux

7f198ba7 · Linus Torvalds <[email protected]> · 2022-10-06 17:42:29 -07:00

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

Commit: 7f198ba7ae9874c64ffe8cd3aa60cf5dab78ce3a
Parents: 76e45035 · 505ffcc8

Merge commit. Changes below are compared with the first parent: 76e45035.

Changes

1 files changed · +1 −1

File	Status	Add	Del	Content
fs/affs/super.c	modified	+1	−1	View file

fs/affs/super.c

View file

diff --git a/fs/affs/super.c b/fs/affs/super.c
index 4c5f30a..58b3914 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;
 		}