diff --git a/[refs] b/[refs] index 714b686f27d9..06de4adfff9d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ec6bbcdb4e85403f2c5958876ca9492afdf4031 +refs/heads/master: 24e6cf92fde1f140d8eb0bf7cd24c2c78149b6b2 diff --git a/trunk/fs/cifs/connect.c b/trunk/fs/cifs/connect.c index 18af707f00f1..ec0ea4a43bdb 100644 --- a/trunk/fs/cifs/connect.c +++ b/trunk/fs/cifs/connect.c @@ -1673,6 +1673,7 @@ cifs_find_smb_ses(struct TCP_Server_Info *server, struct smb_vol *vol) MAX_USERNAME_SIZE)) continue; if (strlen(vol->username) != 0 && + ses->password != NULL && strncmp(ses->password, vol->password ? vol->password : "", MAX_PASSWORD_SIZE))