FAILED: patch "[PATCH] smb: client: Fix next buffer leak in" failed to apply to 5.15-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.15-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.15.y
git checkout FETCH_HEAD
git cherry-pick -x 1c6267a1d5cf4c73b656f8181b310cbbb3e4767b
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2026071454-probe-applicant-d9c0@gregkh' --subject-prefix 'PATCH 5.15.y' 'HEAD^..'
Possible dependencies:
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1c6267a1d5cf4c73b656f8181b310cbbb3e4767b Mon Sep 17 00:00:00 2001
From: Haoxiang Li <[email protected]>
Date: Tue, 23 Jun 2026 09:45:38 +0800
Subject: [PATCH] smb: client: Fix next buffer leak in
receive_encrypted_standard()
receive_encrypted_standard() allocates next_buffer before checking whether the number of compound PDUs already reached MAX_COMPOUND. If the limit check fails, the function returns immediately and the newly allocated next_buffer is not assigned to server->smallbuf/server->bigbuf, making it leaked.
Move the MAX_COMPOUND check before allocating next_buffer.
fs/smb/client/smb2ops.c +6 -4
@@ -5111,6 +5111,12 @@ receive_encrypted_standard(struct TCP_Server_Info *server, one_more: shdr = (struct smb2_hdr *)buf; next_cmd =le32_to_cpu (shdr->NextCommand); + +if (*num_mids >=MAX_COMPOUND ) { +cifs_server_dbg (VFS ,"too many PDUs in compound\n" ); +return -1 ; + } +if (next_cmd) {if (WARN_ON_ONCE (next_cmd > pdu_length))return -1 ;
@@ -5134,10 +5140,6 @@ receive_encrypted_standard(struct TCP_Server_Info *server, mid_entry->resp_buf_size = server->pdu_size; } -if (*num_mids >=MAX_COMPOUND ) { -cifs_server_dbg (VFS ,"too many PDUs in compound\n" ); -return -1 ; - } bufs[*num_mids] = buf; mids[(*num_mids)++] = mid_entry;
Sasha Levin
maintainerPATCH 1/2 cifs: Create a new shared file holding smb2 pdu definitions
From: Ronnie Sahlberg <[email protected]>
[ Upstream commit 0d35e382e4e96a4fd97a1438bc1b11a91d2d85a6 ]
This file will contain all the definitions we need for SMB2 packets and will follow the naming convention of MS-SMB2.PDF as closely as possible to make it easier to cross-reference beween the definitions and the standard.
The content of this file will mostly consist of migration of existing definitions in the cifs/smb2.pdu.h and ksmbd/smb2pdu.h files with some additional tweaks as the two files have diverged.
This patch introduces the new smbfs_common/smb2pdu.h file and migrates the SMB2 header as well as TREE_CONNECT and TREE_DISCONNECT to the shared file.
Stable-dep-of: 1c6267a1d5cf ("smb: client: Fix next buffer leak in receive_encrypted_standard()")
--- fs/cifs/cifsfs.c | 1 - fs/cifs/cifsglob.h | 3 +- fs/cifs/connect.c | 4 +- fs/cifs/misc.c | 2 +- fs/cifs/smb2maperror.c | 16 +- fs/cifs/smb2misc.c | 43 +++-- fs/cifs/smb2ops.c | 65 +++---- fs/cifs/smb2pdu.c | 106 ++++++----- fs/cifs/smb2pdu.h | 373 ++++---------------------------------- fs/cifs/smb2proto.h | 2 +- fs/cifs/smb2transport.c | 36 ++-- fs/smbfs_common/smb2pdu.h | 318 ++++++++++++++++++++++++++++++++ 12 files changed, 493 insertions(+), 476 deletions(-) create mode 100644 fs/smbfs_common/smb2pdu.h
fs/cifs/cifsfs.c +0 -1
@@ -38,7 +38,6 @@#include <linux/key-type.h> #include "cifs_spnego.h" #include "fscache.h" -#include "smb2pdu.h" #ifdef CONFIG_CIFS_DFS_UPCALL #include "dfs_cache.h" #endif
fs/cifs/cifsglob.h +2 -1
@@ -22,6 +22,7 @@#include <crypto/internal/hash.h> #include <linux/scatterlist.h> #include <uapi/linux/cifs/cifs_mount.h> +#include "../smbfs_common/smb2pdu.h" #include "smb2pdu.h" #include "smb2glob.h"
@@ -794,7 +795,7 @@ revert_current_mid(struct TCP_Server_Info *server, const unsigned int val)static inline void revert_current_mid_from_hdr (struct TCP_Server_Info *server, -const struct smb2_sync_hdr *shdr) +const struct smb2_hdr *shdr) {unsigned int num =le16_to_cpu (shdr->CreditCharge);
fs/cifs/connect.c +2 -2
@@ -722,7 +722,7 @@ dequeue_mid(struct mid_q_entry *mid, bool malformed)static unsigned int smb2_get_credits_from_hdr (char *buffer,struct TCP_Server_Info *server) { -struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)buffer; +struct smb2_hdr *shdr = (struct smb2_hdr *)buffer;/* * SMB1 does not use credits.
@@ -926,7 +926,7 @@ cifs_handle_standard(struct TCP_Server_Info *server, struct mid_q_entry *mid)static void smb2_add_credits_from_hdr (char *buffer,struct TCP_Server_Info *server) { -struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)buffer; +struct smb2_hdr *shdr = (struct smb2_hdr *)buffer;int scredits, in_flight;/*
fs/cifs/misc.c +1 -1
@@ -150,7 +150,7 @@ cifs_buf_get(void)* SMB2 header is bigger than CIFS one - no problems to clean some * more bytes for CIFS. */ -size_t buf_size =sizeof (struct smb2_sync_hdr ); +size_t buf_size =sizeof (struct smb2_hdr );/* * We could use negotiated size instead of max_msgsize -
fs/cifs/smb2maperror.c +10 -6
@@ -2439,14 +2439,16 @@ smb2_print_status(__le32 status)int map_smb2_to_linux_error (char *buf,bool log_err) { -struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)buf; +struct smb2_hdr *shdr = (struct smb2_hdr *)buf;unsigned int i;int rc = -EIO ;__le32 smb2err = shdr->Status;if (smb2err ==0 ) { -trace_smb3_cmd_done (shdr->TreeId, shdr->SessionId, -le16_to_cpu (shdr->Command),le64_to_cpu (shdr->MessageId)); +trace_smb3_cmd_done (le32_to_cpu (shdr->Id.SyncId.TreeId), +le64_to_cpu (shdr->SessionId), +le16_to_cpu (shdr->Command), +le64_to_cpu (shdr->MessageId));return 0 ; }
@@ -2470,8 +2472,10 @@ map_smb2_to_linux_error(char *buf, bool log_err)cifs_dbg (FYI ,"Mapping SMB2 status code 0x%08x to POSIX err %d\n" ,__le32_to_cpu (smb2err), rc); -trace_smb3_cmd_err (shdr->TreeId, shdr->SessionId, -le16_to_cpu (shdr->Command), -le64_to_cpu (shdr->MessageId),le32_to_cpu (smb2err), rc); +trace_smb3_cmd_err (le32_to_cpu (shdr->Id.SyncId.TreeId), +le64_to_cpu (shdr->SessionId), +le16_to_cpu (shdr->Command), +le64_to_cpu (shdr->MessageId), +le32_to_cpu (smb2err), rc);return rc; }
fs/cifs/smb2misc.c +21 -22
119 lines not on this page · raw message
fs/cifs/smb2ops.c +33 -32
241 lines not on this page · raw message
fs/cifs/smb2pdu.c +52 -54
383 lines not on this page · raw message
fs/cifs/smb2pdu.h +35 -338
589 lines not on this page · raw message
fs/cifs/smb2proto.h +1 -1
@@ -25,7 +25,7 @@ extern int smb2_check_message(char *buf, unsigned int length, struct TCP_Server_Info *server);extern unsigned int smb2_calc_size (void *buf,struct TCP_Server_Info *server);extern char *smb2_get_data_area_len (int *off,int *len, -struct smb2_sync_hdr *shdr); +struct smb2_hdr *shdr);extern __le16 *cifs_convert_path_to_utf16 (const char *from,struct cifs_sb_info *cifs_sb);
fs/cifs/smb2transport.c +18 -18
@@ -19,7 +19,6 @@#include <linux/mempool.h> #include <linux/highmem.h> #include <crypto/aead.h> -#include "smb2pdu.h" #include "cifsglob.h" #include "cifsproto.h" #include "smb2proto.h"
@@ -213,14 +212,14 @@ smb2_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server,unsigned char smb2_signature[SMB2_HMACSHA256_SIZE ];unsigned char *sigptr = smb2_signature;struct kvec *iov = rqst->rq_iov; -struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0 ].iov_base; +struct smb2_hdr *shdr = (struct smb2_hdr *)iov[0 ].iov_base;struct cifs_ses *ses;struct shash_desc *shash;struct crypto_shash *hash;struct sdesc *sdesc =NULL ;struct smb_rqst drqst; - ses =smb2_find_smb_ses (server, shdr->SessionId); + ses =smb2_find_smb_ses (server,le64_to_cpu (shdr->SessionId));if (unlikely (!ses)) {cifs_server_dbg (VFS ,"%s: Could not find session\n" , __func__);return -ENOENT ;
@@ -549,14 +548,14 @@ smb3_calc_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server,unsigned char smb3_signature[SMB2_CMACAES_SIZE ];unsigned char *sigptr = smb3_signature;struct kvec *iov = rqst->rq_iov; -struct smb2_sync_hdr *shdr = (struct smb2_sync_hdr *)iov[0 ].iov_base; +struct smb2_hdr *shdr = (struct smb2_hdr *)iov[0 ].iov_base;struct shash_desc *shash;struct crypto_shash *hash;struct sdesc *sdesc =NULL ;struct smb_rqst drqst;u8 key[SMB3_SIGN_KEY_SIZE ]; - rc =smb2_get_sign_key (shdr->SessionId, server, key); + rc =smb2_get_sign_key (le64_to_cpu (shdr->SessionId), server, key);if (unlikely (rc)) {cifs_server_dbg (VFS ,"%s: Could not get signing key\n" , __func__);return rc;
@@ -628,12 +627,12 @@ static int smb2_sign_rqst(struct smb_rqst *rqst, struct TCP_Server_Info *server) { int rc = 0; -struct smb2_sync_hdr *shdr; +struct smb2_hdr *shdr;struct smb2_sess_setup_req *ssr;bool is_binding;bool is_signed; - shdr = (struct smb2_sync_hdr *)rqst->rq_iov[0 ].iov_base; + shdr = (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base; ssr = (struct smb2_sess_setup_req *)shdr; is_binding = shdr->Command == SMB2_SESSION_SETUP &&
@@ -659,8 +658,8 @@ smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server) {unsigned int rc;char server_response_sig[SMB2_SIGNATURE_SIZE ]; -struct smb2_sync_hdr *shdr = - (struct smb2_sync_hdr *)rqst->rq_iov[0 ].iov_base; +struct smb2_hdr *shdr = + (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base; if ((shdr->Command == SMB2_NEGOTIATE) || (shdr->Command == SMB2_SESSION_SETUP) ||
@@ -706,7 +705,7 @@ smb2_verify_signature(struct smb_rqst *rqst, struct TCP_Server_Info *server)*/ static inline void smb2_seq_num_into_buf (struct TCP_Server_Info *server, -struct smb2_sync_hdr *shdr) +struct smb2_hdr *shdr) {unsigned int i, num =le16_to_cpu (shdr->CreditCharge);
@@ -717,7 +716,7 @@ smb2_seq_num_into_buf(struct TCP_Server_Info *server, }static struct mid_q_entry * -smb2_mid_entry_alloc (const struct smb2_sync_hdr *shdr, +smb2_mid_entry_alloc (const struct smb2_hdr *shdr,struct TCP_Server_Info *server) {struct mid_q_entry *temp;
@@ -749,14 +748,15 @@ smb2_mid_entry_alloc(const struct smb2_sync_hdr *shdr,atomic_inc (&midCount); temp->mid_state =MID_REQUEST_ALLOCATED ; -trace_smb3_cmd_enter (shdr->TreeId, shdr->SessionId, -le16_to_cpu (shdr->Command), temp->mid); +trace_smb3_cmd_enter (le32_to_cpu (shdr->Id.SyncId.TreeId), +le64_to_cpu (shdr->SessionId), +le16_to_cpu (shdr->Command), temp->mid);return temp; }static int smb2_get_mid_entry (struct cifs_ses *ses,struct TCP_Server_Info *server, -struct smb2_sync_hdr *shdr,struct mid_q_entry **mid) +struct smb2_hdr *shdr,struct mid_q_entry **mid) {if (server->tcpStatus == CifsExiting)return -ENOENT ;
@@ -824,8 +824,8 @@ smb2_setup_request(struct cifs_ses *ses, struct TCP_Server_Info *server, struct smb_rqst *rqst) {int rc; -struct smb2_sync_hdr *shdr = - (struct smb2_sync_hdr *)rqst->rq_iov[0 ].iov_base; +struct smb2_hdr *shdr = + (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base;struct mid_q_entry *mid;smb2_seq_num_into_buf (server, shdr);
@@ -850,8 +850,8 @@ struct mid_q_entry * smb2_setup_async_request(struct TCP_Server_Info *server, struct smb_rqst *rqst) { int rc; -struct smb2_sync_hdr *shdr = - (struct smb2_sync_hdr *)rqst->rq_iov[0 ].iov_base; +struct smb2_hdr *shdr = + (struct smb2_hdr *)rqst->rq_iov[0 ].iov_base;struct mid_q_entry *mid; if (server->tcpStatus == CifsNeedNegotiate &&
fs/smbfs_common/smb2pdu.h new file +318 -0
318 lines not on this page · raw message
Signature · 1 line
2.53.0
Sasha Levin
maintainerPATCH 2/2 smb: client: Fix next buffer leak in receive_encrypted_standard()
From: Haoxiang Li <[email protected]>
[ Upstream commit 1c6267a1d5cf4c73b656f8181b310cbbb3e4767b ]
receive_encrypted_standard() allocates next_buffer before checking whether the number of compound PDUs already reached MAX_COMPOUND. If the limit check fails, the function returns immediately and the newly allocated next_buffer is not assigned to server->smallbuf/server->bigbuf, making it leaked.
Move the MAX_COMPOUND check before allocating next_buffer.
--- fs/cifs/smb2ops.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/cifs/smb2ops.c +6 -4
@@ -5211,6 +5211,12 @@ receive_encrypted_standard(struct TCP_Server_Info *server, one_more: shdr = (struct smb2_hdr *)buf; next_cmd =le32_to_cpu (shdr->NextCommand); + +if (*num_mids >=MAX_COMPOUND ) { +cifs_server_dbg (VFS ,"too many PDUs in compound\n" ); +return -1 ; + } +if (next_cmd) {if (WARN_ON_ONCE (next_cmd > pdu_length))return -1 ;
@@ -5234,10 +5240,6 @@ receive_encrypted_standard(struct TCP_Server_Info *server, mid_entry->resp_buf_size = server->pdu_size; } -if (*num_mids >=MAX_COMPOUND ) { -cifs_server_dbg (VFS ,"too many PDUs in compound\n" ); -return -1 ; - } bufs[*num_mids] = buf; mids[(*num_mids)++] = mid_entry;
Signature · 1 line
2.53.0