Commit 7f198ba7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 76e45035 505ffcc8

fs/affs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}