paul.gortmaker at windriver
May 14, 2012, 7:13 PM
Post #1 of 1
From: Jeff Layton <jlayton [at] redhat>
[34-longterm 141/179] cifs: fix NULL pointer dereference in cifs_find_smb_ses
This is a commit scheduled for the next v2.6.34 longterm release.
If you see a problem with using this for longterm, please comment.
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 [at] wp>
Signed-off-by: Jeff Layton <jlayton [at] redhat>
Signed-off-by: Steve French <sfrench [at] us>
Signed-off-by: Paul Gortmaker <paul.gortmaker [at] windriver>
fs/cifs/connect.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 4e134a7..0fbc8d2 100644
@@ -1609,7 +1609,8 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol)
if (strlen(vol->username) != 0 &&
- strncmp(ses->password, vol->password,
+ vol->password ? vol->password : "",
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo [at] vger
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/