Skip to content

Commit db341b0

Browse files
vwaxsmb49
authored andcommitted
cifs: Fix preauth hash corruption
BugLink: https://bugs.launchpad.net/bugs/1923214 commit 05946d4 upstream. smb311_update_preauth_hash() uses the shash in server->secmech without appropriate locking, and this can lead to sessions corrupting each other's preauth hashes. The following script can easily trigger the problem: #!/bin/sh -e NMOUNTS=10 for i in $(seq $NMOUNTS); mkdir -p /tmp/mnt$i umount /tmp/mnt$i 2>/dev/null || : done while :; do for i in $(seq $NMOUNTS); do mount -t cifs //192.168.0.1/test /tmp/mnt$i -o ... & done wait for i in $(seq $NMOUNTS); do umount /tmp/mnt$i done done Usually within seconds this leads to one or more of the mounts failing with the following errors, and a "Bad SMB2 signature for message" is seen in the server logs: CIFS: VFS: \\192.168.0.1 failed to connect to IPC (rc=-13) CIFS: VFS: cifs_mount failed w/return code = -13 Fix it by holding the server mutex just like in the other places where the shashes are used. Fixes: 8bd68c6 ("CIFS: implement v3.11 preauth integrity") Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> CC: <stable@vger.kernel.org> Reviewed-by: Aurelien Aptel <aaptel@suse.com> Signed-off-by: Steve French <stfrench@microsoft.com> [aaptel: backport to kernel without CIFS_SESS_OP] Signed-off-by: Aurelien Aptel <aaptel@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Kamal Mostafa <kamal@canonical.com> Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
1 parent 550d00c commit db341b0

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

fs/cifs/transport.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,9 +1134,12 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
11341134
/*
11351135
* Compounding is never used during session establish.
11361136
*/
1137-
if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP))
1137+
if ((ses->status == CifsNew) || (optype & CIFS_NEG_OP)) {
1138+
mutex_lock(&server->srv_mutex);
11381139
smb311_update_preauth_hash(ses, rqst[0].rq_iov,
11391140
rqst[0].rq_nvec);
1141+
mutex_unlock(&server->srv_mutex);
1142+
}
11401143

11411144
for (i = 0; i < num_rqst; i++) {
11421145
rc = wait_for_response(server, midQ[i]);
@@ -1204,7 +1207,9 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses,
12041207
.iov_base = resp_iov[0].iov_base,
12051208
.iov_len = resp_iov[0].iov_len
12061209
};
1210+
mutex_lock(&server->srv_mutex);
12071211
smb311_update_preauth_hash(ses, &iov, 1);
1212+
mutex_unlock(&server->srv_mutex);
12081213
}
12091214

12101215
out:

0 commit comments

Comments
 (0)