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

4bb01220 · Linus Torvalds <[email protected]> · 2025-07-25 08:00:48 -07:00

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

Commit: 4bb01220911d2dd6846573850937e89691f92e20
Parents: bef3012b · 8b3c655f

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

Changes

2 files changed · +2 −1

File	Status	Add	Del	Content
fs/afs/addr_prefs.c	modified	+1	−1	View file
fs/afs/cell.c	modified	+1	−0	View file

fs/afs/addr_prefs.c

View file

diff --git a/fs/afs/addr_prefs.c b/fs/afs/addr_prefs.c
index c038420..1337364 100644
--- a/fs/afs/addr_prefs.c
+++ b/fs/afs/addr_prefs.c
@@ -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

View file

diff --git a/fs/afs/cell.c b/fs/afs/cell.c
index 0168bbf..f313599 100644
--- a/fs/afs/cell.c
+++ b/fs/afs/cell.c
@@ -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;
 		}
 