CIFS: Fix problem with 3.0-rc1 null user mount failure
authorPavel Shilovsky <piastryyy@gmail.com>
Mon, 20 Jun 2011 08:33:16 +0000 (12:33 +0400)
committerSteve French <sfrench@us.ibm.com>
Wed, 22 Jun 2011 21:43:56 +0000 (21:43 +0000)
Figured it out: it was broken by b946845a9dc523c759cae2b6a0f6827486c3221a 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>
fs/cifs/connect.c

index 12cf72dd0c42963b75f674edbb651bb32ccb486c..19fdbda7aa95e272a743544b52aedcf28d386e63 100644 (file)
@@ -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);