Skip to content

Commit 4bb0122

Browse files
committed
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
2 parents bef3012 + 8b3c655 commit 4bb0122

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

fs/afs/addr_prefs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static int afs_split_string(char **pbuf, char *strv[], unsigned int maxstrv)
4848
strv[count++] = p;
4949

5050
/* Skip over word */
51-
while (!isspace(*p))
51+
while (!isspace(*p) && *p)
5252
p++;
5353
if (!*p)
5454
break;

fs/afs/cell.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,7 @@ static struct afs_cell *afs_alloc_cell(struct afs_net *net,
177177
VL_SERVICE, AFS_VL_PORT);
178178
if (IS_ERR(vllist)) {
179179
ret = PTR_ERR(vllist);
180+
vllist = NULL;
180181
goto parse_failed;
181182
}
182183

0 commit comments

Comments
 (0)