diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-08-18 13:13:39 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-08 10:23:16 -0700 |
| commit | eda9d27e356873efbd5f071da1741fc74a842c2b (patch) | |
| tree | 3c97a9d61d2766ebac7268c9fa6a9c913cac4a1c /fs | |
| parent | 223c7f082d2836ac719b3b228bdcfab35e5e5330 (diff) | |
cifs: fix NULL pointer dereference in cifs_find_smb_ses
commit fc87a40677bbe0937e2ff0642c7e83c9a4813f3d upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 73ddd0b4069..e15b09457a9 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1605,7 +1605,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; } |