Skip to content

Commit

Permalink
CIFS: Fix problem with 3.0-rc1 null user mount failure
Browse files Browse the repository at this point in the history
Figured it out: it was broken by b946845 commit - "cifs: cifs_parse_mount_options: do not tokenize mount options in-place". So, as a quick fix I suggest to apply this patch.

[PATCH] CIFS: Fix kfree() with constant string in a null user case

Signed-off-by: Pavel Shilovsky <piastryyy@gmail.com>
Reviewed-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
  • Loading branch information
Pavel Shilovsky authored and Steve French committed Jun 22, 2011
1 parent 2992c4b commit 446b23a
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion fs/cifs/connect.c
Original file line number Diff line number Diff line change
Expand Up @@ -2937,7 +2937,11 @@ int cifs_setup_volume_info(struct smb_vol **pvolume_info, char *mount_data,

if (volume_info->nullauth) {
cFYI(1, "null user");
volume_info->username = "";
volume_info->username = kzalloc(1, GFP_KERNEL);
if (volume_info->username == NULL) {
rc = -ENOMEM;
goto out;
}
} else if (volume_info->username) {
/* BB fixme parse for domain name here */
cFYI(1, "Username: %s", volume_info->username);
Expand Down

0 comments on commit 446b23a

Please sign in to comment.