Merge tag '6.6-rc3-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6

torvalds · torvalds · commit ba77f7a63f4e · 2023-09-30T09:39:23.000-07:00
Pull smb client fix from Steve French:
 "Fix for password freeing potential oops (also for stable)"

* tag '6.6-rc3-smb3-client-fix' of git://git.samba.org/sfrench/cifs-2.6:
  fs/smb/client: Reset password pointer to NULL
diff --git a/fs/smb/client/fs_context.c b/fs/smb/client/fs_context.c
@@ -1541,6 +1541,7 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,
 
  cifs_parse_mount_err:
 	kfree_sensitive(ctx->password);
+	ctx->password = NULL;
 	return -EINVAL;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1541,6 +1541,7 @@ static int smb3_fs_context_parse_param(struct fs_context *fc,`
`1541`	`1541`
`1542`	`1542`	`cifs_parse_mount_err:`
`1543`	`1543`	`kfree_sensitive(ctx->password);`
	`1544`	`+ ctx->password = NULL;`
`1544`	`1545`	`return -EINVAL;`
`1545`	`1546`	`}`
`1546`	`1547`