cifs: fix NULL pointer dereference in cifs_find_smb_ses
authorJeff Layton <jlayton@redhat.com>
Wed, 18 Aug 2010 17:13:39 +0000 (13:13 -0400)
committerSteve French <sfrench@us.ibm.com>
Wed, 18 Aug 2010 17:26:25 +0000 (17:26 +0000)
cifs_find_smb_ses assumes that the vol->password field is a valid
pointer, but that's only the case if a password was passed in via
the options string. It's possible that one won't be if there is
no mount helper on the box.

Reported-by: diabel <gacek-2004@wp.pl>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve French <sfrench@us.ibm.com>
fs/cifs/connect.c

index 95c2ea67edfb8f240d286885caddd51031aa82fc..446e2486d5f000d956193aa14ffea5db26fdcba0 100644 (file)
@@ -1673,7 +1673,8 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
                                    MAX_USERNAME_SIZE))
                                continue;
                        if (strlen(vol->username) != 0 &&
-                           strncmp(ses->password, vol->password,
+                           strncmp(ses->password,
+                                   vol->password ? vol->password : "",
                                    MAX_PASSWORD_SIZE))
                                continue;
                }