diff options
| author | Namjae Jeon <linkinjeon@kernel.org> | 2026-08-13 09:00:00 +0900 |
|---|---|---|
| committer | Namjae Jeon <linkinjeon@kernel.org> | 2026-08-17 22:38:24 +0900 |
| commit | 2cbd4a8bf460cdf414a2d7e4912c5bcfe3d0fdc2 (patch) | |
| tree | 5aa6c09d9096a59a591252281d089c912a31d876 /fs/smb | |
| parent | 50a400cff59f534254ace2828f2eb9d844517fbb (diff) | |
| download | linux-next-2cbd4a8bf460cdf414a2d7e4912c5bcfe3d0fdc2.tar.gz linux-next-2cbd4a8bf460cdf414a2d7e4912c5bcfe3d0fdc2.zip | |
ksmbd: fix encrypted request lookup on bound channels
An SMB3 multichannel binding registers the secondary connection in the
session channel list, but does not insert the session into the secondary
connection's session xarray.
The decryption path only searches the connection-local xarray. As a
result, every encrypted request received on a bound channel fails with
"Could not get decryption key".
Use the channel-aware session lookup for decryption. Also stop using the
temporary conn->binding flag to decide whether the global lookup is
allowed. Validate the permanent channel association under chann_lock
instead.
Fixes: f5a544e3bab7 ("ksmbd: add support for SMB3 multichannel")
Signed-off-by: Namjae Jeon <linkinjeon@kernel.org>
Diffstat (limited to 'fs/smb')
| -rw-r--r-- | fs/smb/server/auth.c | 2 | ||||
| -rw-r--r-- | fs/smb/server/mgmt/user_session.c | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/fs/smb/server/auth.c b/fs/smb/server/auth.c index 2f89af029247..bcd371f5550d 100644 --- a/fs/smb/server/auth.c +++ b/fs/smb/server/auth.c @@ -729,7 +729,7 @@ static int ksmbd_get_encryption_key(struct ksmbd_work *work, __u64 ses_id, * that the command can reach the session setup handler. Other * commands are rejected there with STATUS_NETWORK_SESSION_EXPIRED. */ - sess = ksmbd_session_lookup(work->conn, ses_id); + sess = ksmbd_session_lookup_all_states(work->conn, ses_id); if (sess && sess->state != SMB2_SESSION_VALID && (sess->state != SMB2_SESSION_EXPIRED || !sess->kerberos_expiry)) { diff --git a/fs/smb/server/mgmt/user_session.c b/fs/smb/server/mgmt/user_session.c index f4675c457714..31eccad5d732 100644 --- a/fs/smb/server/mgmt/user_session.c +++ b/fs/smb/server/mgmt/user_session.c @@ -551,11 +551,18 @@ struct ksmbd_session *ksmbd_session_lookup_all_states(struct ksmbd_conn *conn, unsigned long long id) { struct ksmbd_session *sess; + bool channel_found; sess = ksmbd_session_lookup(conn, id); - if (!sess && conn->binding) { + if (!sess) { sess = ksmbd_session_lookup_slowpath(id); - if (sess && !xa_load(&sess->ksmbd_chann_list, (long)conn)) { + if (!sess) + return NULL; + + down_read(&sess->chann_lock); + channel_found = xa_load(&sess->ksmbd_chann_list, (long)conn); + up_read(&sess->chann_lock); + if (!channel_found) { ksmbd_user_session_put(sess); sess = NULL; } |