diff options
| author | Jeff Layton <jlayton@redhat.com> | 2010-08-18 19:13:39 +0200 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-08-18 19:26:25 +0200 |
| commit | fc87a40677bbe0937e2ff0642c7e83c9a4813f3d (patch) | |
| tree | 31912b8904ee316cee40d568db330c4e65e39325 /fs | |
| parent | cifs: consolidate error handling in several functions (diff) | |
| download | linux-fc87a40677bbe0937e2ff0642c7e83c9a4813f3d.tar.xz linux-fc87a40677bbe0937e2ff0642c7e83c9a4813f3d.zip | |
cifs: fix NULL pointer dereference in cifs_find_smb_ses
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>
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 95c2ea67edfb..446e2486d5f0 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -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; } |