From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.210.180 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794329941; b=X1j3pGCvPBJ1N40LvyVYCHuhiHq/or6YKLAkk5+EGAugtieRKIEbL0mgPXSIok/C7ZzK 8KDcVjAx7teu8SLIHXb6aQwrU8DvT7kj0cbquVIhoZdEW1NjdDmIYWKBpesCPeISOKU5X Ig5hyIIBlzbMXtkfLTQQBfD5CMzkDX2uSpoGa6Qt9Rljzkwnc+wocFYd5K9wKCT+0mkSk ViL93IiyRoaL62tiIRK46QErEODctd0pTGgRGSeU4eMpwVLHpAyrYeofcFsAhdxUJG9fr OGqhDNvFeDVeWmUnY+Dhbn4NIwttCPQIgO75blBnbn3DGqT/yFVsh+wr84m0hLbqcqg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794329941; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=ZwRselDa1l8gKoulhCdVLjsTKJQ+34Sz7SHZBIjKDPI=; b=di9giJ25/MdHvr8xSdPN8QX6nHHPNZm3SAaIBTarjF030b873yPYhsBiFRbT2LzNIwpf lKICt1egVomiG/rc7t5SzknnEWiKeLt6wuVXSUMiEYRSS6dRGIsfsIpw3gVVprTVMvw4T rlAmjq5ZT/d8FFVV+WdIZCuRLOdvaa6RS0WJ8UXmD+si0YHTx7Wgo+pXHBW9VpPo+AKKs 5ygK+YuzmxiHMhPT8si5vSZ/NHOm0QhxWYBVjfkEITnJ10HwPK+L9f/Jp0ICYP6IrvqrF 4ndnK/PyQSCexfevke7togMbZOpH8/pZEXJj6H8OCcB/k477ew6VjRsy4hknzkL20Sw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b="zhK0/skk"; arc=none smtp.remote-ip=209.85.210.180 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43C0E606A33A for ; Tue, 10 Nov 2026 16:59:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 43C0E606A33A Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=zhK0/skk Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-8b9c51097e2so926119b3a.1 for ; Tue, 10 Nov 2026 08:59:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1794329940; x=1794934740; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=ZwRselDa1l8gKoulhCdVLjsTKJQ+34Sz7SHZBIjKDPI=; b=zhK0/skkvRI8hLnZNsUUEXtyBeA153mBgD6Ym9Nv4alPgU5olRbcDoeSNAOk5tJi61 6adiuEdlS21KyvvSv4j3Dzib4Jl/7sTeGQPIVpxMPVUuV+g4rTyEYs1+otajY5cTOzXc FhDl/fkonzWix5Yo6rQ8OgEJjXoS1leARxLUcXA5N2iZ6TpzFL5GV9MuB8bkOVTneSV+ BeZ+lC3/RQs70geiY9UbnQYlVXVXs/gN0Vp5UrVjyucMAuMVKxg5mVQIsdCDNEUY1NY/ RxeF+cRN2v3ei1ImSjg44U59fMqwKOhcIobI56oQwSwLMCIV/pzCBjal+yTX/DpLXWLg EzUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1794329940; x=1794934740; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=ZwRselDa1l8gKoulhCdVLjsTKJQ+34Sz7SHZBIjKDPI=; b=u7bBGW7toaQlix1moHVN78S0FDGUgvfJ7yEFTZHDXh7V5OhBSN4yYB735qFAeKiq6o g6CIiklHI0P85uyg/eauXIME9XgzIP05uv249Z0YBg/e5tEX4F6LSS2ISBWjoORjA5zD Lg8bHNgoSVT1Q5UHVtwP5yooTB8p/YHN8XtKADLGnT99rdt9TwncaAfwYUUm5czYgBQ/ RYRB7s5MNfkD7KgyEjs2kibfkL0paug+mOpob0SyI8YgSgOWA2lIYlHC/kyZsPdcbHs6 n6k/M92CsloLmGvsK60wqYMBDNYoFzSpo0crQBkYBdNHYpUUBgymW/P9E8MNSwKpg3y3 6Q4A== X-Forwarded-Encrypted: i=1; AL+hErE51ZvwBysTsTIhtm/JW5tFdBkks1r/cEuoRL4D94iusDwk2jAYrRgEyY/tzw44PBxp/vhLNKHUPWrOnQM=@vger.kernel.org X-Gm-Message-State: APuU4Z/0UP7dTQ7CeLUU+Cp0LZTqSnD4DsfqncNg+deSL9zthEEIV0Wo q98v4/tHFhHTctmVy/QVCxTvr+C3FdqYgEETvAEZZszV7ysm4Dvgb0ga X-Gm-Gg: AYBFou3o/aRU75qCkw63Qm9ybhhhLPUkhsdSKhaw3ca0ptYItOFTDR3e2ag6O4ghjrf YootXy3p6Cejj9SCadviOcQ/iQ+aX2wiqrkUxKidBLBx/1AqBDZPywEjfRIErJu1mCPmNvkJo14 5thEliZKsdO0skoIxRi9/sHvtOMfTNUNbkZVldaUGgMNM5kcJryccg0bO2z6uJpzpVqqG2T49+S RH6eZ6MMbUzKXZhpmi8lchSHm7vhFsuyq53RBp0rHiQr/SWOuhLW75Aagiep3qnyRUsk7EAheci r4D1M3blMcxlUcphQzVVM0DFidxvmx2P0pOjQIsSPS2GIoo37LhAuGIPoaP73FIM6YRtN/MSuym EeRj3BAY04OScuLQksTy82p+I1V63ezjp4ZhGyZlxT7Oq3STTN1KmGJn6o6XCPALJq1IV1Ohdv9 74YvOtg6etbiEbr5J/sJeyg/UUT1NhOY9uhWOL0TacJPQORDnkaDeYWc6QqXgeqZIMf4LfGIUyS xUej5KORWdApWWM4PQfCZ6lUrVeOK22alp+R+GJRtBTtw7ygaXr7oEZRouykgQ+HYvbKT7c5pEF 5Yjy0zPwYNnflJSG8ra4ufAkKmcSOi5Vt4JBRorapUsd5WaZ96WhaATujDfgnBKHtTXK+ETANFZ llxjUJ4qm27HwntI91PxHMKY7o2zaWsdfg9cAV4drMCCh1lePnmK+/Rw= X-Received: by 2002:a05:6a00:148d:b0:873:e3b4:5d4 with SMTP id d2e1a72fcca58-8ba82b55227mr3115023b3a.2.1794329940141; Tue, 10 Nov 2026 08:59:00 -0800 (PST) Received: from localhost.localdomain (mx-ll-183.88.2-201.dynamic.3bb.co.th. [183.88.2.201]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8baab4fd5c6sm1157154b3a.46.2026.11.10.08.58.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 10 Nov 2026 08:58:59 -0800 (PST) From: Michail Andreas Michalopoulos To: linkinjeon@kernel.org, stfrench@microsoft.com Cc: icb@fastmail.org, senozhatsky@chromium.org, tom@talpey.com, chenxiaosong@chenxiaosong.com, ematsumiya@suse.de, lsahlber@redhat.com, hyc.lee@gmail.com, linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, Michail Andreas Michalopoulos , stable@vger.kernel.org Subject: [PATCH v4 2/6] ksmbd: sign with the negotiated SMB 3.1.1 signing algorithm Date: Tue, 10 Nov 2026 23:58:30 +0700 Message-ID: <20261110165834.28162-3-mike.michalo@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261110165834.28162-1-mike.michalo@gmail.com> References: <20261110165834.28162-1-mike.michalo@gmail.com> X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit decode_sign_cap_ctxt() stores the algorithm picked from the client's SMB2_SIGNING_CAPABILITIES context in conn->signing_algorithm, but it runs before init_smb3_11_server(), which then overwrites it with AES-CMAC. As a result the negotiate response always selects AES-CMAC, even for a client that only offered HMAC-SHA256, and every SMB 3.1.1 connection is signed with AES-CMAC. Keep the negotiated algorithm and sign with HMAC-SHA256 when that is what was negotiated. Since connections of the same session can now use different algorithms, each signing key also has to be used with the algorithm it was created for. The session signing key belongs to the connection that set up the session, and MS-SMB2 3.3.5.5 requires a binding request on a new channel to be verified with it. Store that connection's algorithm in the session and use it together with the session key, while channel keys keep using their own connection's algorithm. An AI assistant was used to draft the patch and as an independent reviewer. Testing is described in the cover letter. Fixes: 378087cd17ee ("ksmbd: add support for negotiating signing algorithm") Cc: stable@vger.kernel.org Signed-off-by: Michail Andreas Michalopoulos --- fs/smb/server/auth.c | 14 ++++++++++++-- fs/smb/server/auth.h | 4 ++-- fs/smb/server/mgmt/user_session.c | 1 + fs/smb/server/mgmt/user_session.h | 2 ++ fs/smb/server/smb2ops.c | 4 +++- fs/smb/server/smb2pdu.c | 20 ++++++++++++++++++-- 6 files changed, 38 insertions(+), 7 deletions(-) diff --git a/fs/smb/server/auth.c b/fs/smb/server/auth.c index 0c51ca0cb14db..fc6ace49584b1 100644 --- a/fs/smb/server/auth.c +++ b/fs/smb/server/auth.c @@ -504,19 +504,29 @@ void ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, /** * ksmbd_sign_smb3_pdu() - function to generate packet signing * @conn: connection + * @signing_algorithm: signing algorithm the key was generated for * @key: signing key * @iov: buffer iov array * @n_vec: number of iovecs * @sig: signature value generated for client request packet * */ -void ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, - int n_vec, char *sig) +void ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, __le16 signing_algorithm, + char *key, struct kvec *iov, int n_vec, char *sig) { struct aes_cmac_key cmac_key __cleanup(aes_cmac_zeroize_key); struct aes_cmac_ctx cmac_ctx; int i; + if (signing_algorithm == SIGNING_ALG_HMAC_SHA256_LE) { + u8 mac[SMB2_HMACSHA256_SIZE]; + + ksmbd_sign_smb2_pdu(conn, key, iov, n_vec, mac); + memcpy(sig, mac, SMB2_SIGNATURE_SIZE); + memzero_explicit(mac, sizeof(mac)); + return; + } + /* This cannot fail, since we always pass a valid key length. */ static_assert(SMB2_CMACAES_SIZE == AES_KEYSIZE_128); aes_cmac_preparekey(&cmac_key, key, SMB2_CMACAES_SIZE); diff --git a/fs/smb/server/auth.h b/fs/smb/server/auth.h index 7ce9c42d58f1e..5a10482678ee4 100644 --- a/fs/smb/server/auth.h +++ b/fs/smb/server/auth.h @@ -59,8 +59,8 @@ int ksmbd_krb5_authenticate(struct ksmbd_session *sess, char *in_blob, char *sess_key); void ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, int n_vec, char *sig); -void ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, - int n_vec, char *sig); +void ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, __le16 signing_algorithm, + char *key, struct kvec *iov, int n_vec, char *sig); int ksmbd_gen_smb30_signingkey(struct ksmbd_session *sess, struct ksmbd_conn *conn); int ksmbd_gen_smb311_signingkey(struct ksmbd_session *sess, diff --git a/fs/smb/server/mgmt/user_session.c b/fs/smb/server/mgmt/user_session.c index 15662fd745abb..87aba04a8cbdd 100644 --- a/fs/smb/server/mgmt/user_session.c +++ b/fs/smb/server/mgmt/user_session.c @@ -557,6 +557,7 @@ int ksmbd_session_register(struct ksmbd_conn *conn, int ret; sess->dialect = conn->dialect; + sess->signing_algorithm = conn->signing_algorithm; memcpy(sess->ClientGUID, conn->ClientGUID, SMB2_CLIENT_GUID_SIZE); ret = xa_err(xa_store(&conn->sessions, sess->id, sess, KSMBD_DEFAULT_GFP)); diff --git a/fs/smb/server/mgmt/user_session.h b/fs/smb/server/mgmt/user_session.h index 5f0f6276e3168..931ca102b8392 100644 --- a/fs/smb/server/mgmt/user_session.h +++ b/fs/smb/server/mgmt/user_session.h @@ -48,6 +48,8 @@ struct ksmbd_session { u64 id; __u16 dialect; + /* Signing algorithm of the connection that created the session */ + __le16 signing_algorithm; char ClientGUID[SMB2_CLIENT_GUID_SIZE]; struct ksmbd_user *user; diff --git a/fs/smb/server/smb2ops.c b/fs/smb/server/smb2ops.c index 747276b171bd1..c5b3cf34494e7 100644 --- a/fs/smb/server/smb2ops.c +++ b/fs/smb/server/smb2ops.c @@ -320,7 +320,9 @@ int init_smb3_11_server(struct ksmbd_conn *conn) conn->ops = &smb3_11_server_ops; conn->cmds = smb2_0_server_cmds; conn->max_cmds = ARRAY_SIZE(smb2_0_server_cmds); - conn->signing_algorithm = SIGNING_ALG_AES_CMAC_LE; + /* Keep the algorithm chosen from the client's signing capabilities */ + if (!conn->signing_negotiated) + conn->signing_algorithm = SIGNING_ALG_AES_CMAC_LE; if (server_conf.flags & KSMBD_GLOBAL_FLAG_SMB2_LEASES) conn->vals->req_capabilities |= SMB2_GLOBAL_CAP_LEASING | diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 053f3eb398f5a..ddaa98055154a 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -1858,6 +1858,8 @@ static __le32 deassemble_neg_contexts(struct ksmbd_conn *conn, bool posix_ctxt_seen = false; ksmbd_debug(SMB, "decoding %d negotiate contexts\n", neg_ctxt_cnt); + /* A previous, failed NEGOTIATE must not leave its algorithm behind */ + conn->signing_negotiated = false; if (len_of_smb <= offset) { ksmbd_debug(SMB, "Invalid response: negotiate context offset\n"); return status; @@ -12953,6 +12955,7 @@ int smb3_check_sign_req(struct ksmbd_work *work) { struct ksmbd_conn *conn = work->conn; char *signing_key; + __le16 signing_algorithm; struct smb2_hdr *hdr; struct channel *chann; char signature_req[SMB2_SIGNATURE_SIZE]; @@ -12972,8 +12975,14 @@ int smb3_check_sign_req(struct ksmbd_work *work) len = get_rfc1002_len(work->request_buf) - work->next_smb2_rcv_hdr_off; + /* + * A key must be used with the algorithm it was generated for: the + * session key with the one of the connection that created the + * session, which can differ from this connection's when binding. + */ if (le16_to_cpu(hdr->Command) == SMB2_SESSION_SETUP_HE) { signing_key = work->sess->smb3signingkey; + signing_algorithm = work->sess->signing_algorithm; } else { chann = lookup_chann_list(work->sess, conn); if (!chann) { @@ -12981,8 +12990,10 @@ int smb3_check_sign_req(struct ksmbd_work *work) !(hdr->Flags & SMB2_FLAGS_SIGNED)) return 0; signing_key = work->sess->smb3signingkey; + signing_algorithm = work->sess->signing_algorithm; } else { signing_key = chann->smb3signingkey; + signing_algorithm = conn->signing_algorithm; } } @@ -12996,7 +13007,8 @@ int smb3_check_sign_req(struct ksmbd_work *work) iov[0].iov_base = (char *)&hdr->ProtocolId; iov[0].iov_len = len; - ksmbd_sign_smb3_pdu(conn, signing_key, iov, 1, signature); + ksmbd_sign_smb3_pdu(conn, signing_algorithm, signing_key, iov, 1, + signature); /* Restore the request as received, for the SMB 3.1.1 preauth hash */ memcpy(hdr->Signature, signature_req, SMB2_SIGNATURE_SIZE); @@ -13023,6 +13035,7 @@ void smb3_set_sign_rsp(struct ksmbd_work *work) u16 command; int n_vec; char *signing_key; + __le16 signing_algorithm; hdr = ksmbd_resp_buf_curr(work); command = le16_to_cpu(hdr->Command); @@ -13030,12 +13043,14 @@ void smb3_set_sign_rsp(struct ksmbd_work *work) if (command == SMB2_SESSION_SETUP_HE && (!work->session_setup_binding || hdr->Status != STATUS_SUCCESS)) { signing_key = work->sess->smb3signingkey; + signing_algorithm = work->sess->signing_algorithm; } else { chann = lookup_chann_list(work->sess, work->conn); if (!chann) { return; } signing_key = chann->smb3signingkey; + signing_algorithm = conn->signing_algorithm; } if (!signing_key) @@ -13046,7 +13061,8 @@ void smb3_set_sign_rsp(struct ksmbd_work *work) iov = smb2_get_sign_rsp_iov(work, hdr, &n_vec); - ksmbd_sign_smb3_pdu(conn, signing_key, iov, n_vec, signature); + ksmbd_sign_smb3_pdu(conn, signing_algorithm, signing_key, iov, n_vec, + signature); memcpy(hdr->Signature, signature, SMB2_SIGNATURE_SIZE); } -- 2.43.0