Skip to content

Commit 6e00e12

Browse files
dhkts1namjaejeon
authored andcommitted
ksmbd: reject non-VALID session in compound request branch
smb2_check_user_session() takes a shortcut for any operation that is not the first in a COMPOUND request: it reuses work->sess (the session bound by the first operation) and validates only the SessionId, then returns "valid". It never re-checks work->sess->state == SMB2_SESSION_VALID, and a SessionId of 0xFFFFFFFFFFFFFFFF (ULLONG_MAX, the MS-SMB2 related-operation value) skips even the id comparison. The standalone path (ksmbd_session_lookup_all() plus the SESSION_SETUP state machine) does enforce the VALID state; the compound branch bypasses all of it. A SESSION_SETUP carrying only an NTLM Type-1 (NtLmNegotiate) blob publishes a fresh SMB2_SESSION_IN_PROGRESS session whose sess->user is still NULL (->user is assigned later, by ntlm_authenticate()). Used as operation 1 of a COMPOUND with operation 2 = TREE_CONNECT (related, SessionId=ULLONG_MAX, \\host\IPC$), the tree-connect then runs on that IN_PROGRESS session and reaches ksmbd_ipc_tree_connect_request(), which dereferences user_name(sess->user) with sess->user == NULL (transport_ipc.c:687/701/704) -> remote NULL-pointer dereference and a kernel Oops that wedges the ksmbd worker for all clients. Reject any non-first compound operation that lands on a session which is not SMB2_SESSION_VALID, mirroring the validity the standalone lookup path enforces. SESSION_SETUP itself legitimately runs on an IN_PROGRESS session, but it is never carried as a non-first compound operation, so multi-leg authentication is unaffected by this check. Reproduced on mainline 7.1-rc7 with KASAN by an authenticated SMB client (including a GUEST session): a single COMPOUND oopsed the kernel (null-ptr-deref in ksmbd_ipc_tree_connect_request) and left the service unresponsive to all subsequent clients. Fixes: 5005bcb42191 ("ksmbd: validate session id and tree id in the compound request") Cc: stable@vger.kernel.org Signed-off-by: Gil Portnoy <dddhkts1@gmail.com> Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
1 parent df98ccf commit 6e00e12

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

smb2pdu.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -618,6 +618,11 @@ int smb2_check_user_session(struct ksmbd_work *work)
618618
sess_id, work->sess->id);
619619
return -EINVAL;
620620
}
621+
if (work->sess->state != SMB2_SESSION_VALID) {
622+
pr_err("compound request on a non-valid session (state %d)\n",
623+
work->sess->state);
624+
return -EINVAL;
625+
}
621626
return 1;
622627
}
623628

0 commit comments

Comments
 (0)