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

torvalds · torvalds · commit 7f198ba7ae98 · 2022-10-06T17:42:29.000-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
diff --git 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;
 		}

Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ parse_options(char options, kuid_t uid, kgid_t gid, int mode, int *reserved,`
`276`	`276`	`char *vol = match_strdup(&args[0]);`
`277`	`277`	`if (!vol)`
`278`	`278`	`return 0;`
`279`		`- strlcpy(volume, vol, 32);`
	`279`	`+ strscpy(volume, vol, 32);`
`280`	`280`	`kfree(vol);`
`281`	`281`	`break;`
`282`	`282`	`}`