Commit 4bb01220 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.16-rc8.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull vfs fixes from Christian Brauner:
 "Two last-minute fixes for this cycle:

   - Set afs vllist to NULL if addr parsing fails

   - Add a missing check for reaching the end of the string in afs"

* tag 'vfs-6.16-rc8.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  afs: Set vllist to NULL if addr parsing fails
  afs: Fix check for NULL terminator
parents bef3012b 8b3c655f

fs/afs/addr_prefs.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static int afs_split_string(char **pbuf, char *strv[], unsigned int maxstrv) 
		strv[count++] = p;



		/* Skip over word */

		while (!isspace(*p))

		while (!isspace(*p) && *p)

			p++;

		if (!*p)

			break;

fs/afs/cell.c

+1 −0
Original line number Diff line number Diff line
@@ -177,6 +177,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net, 
					      VL_SERVICE, AFS_VL_PORT);

		if (IS_ERR(vllist)) {

			ret = PTR_ERR(vllist);

			vllist = NULL;

			goto parse_failed;

		}