Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E9DB617BEBF for ; Sun, 9 Aug 2026 01:22:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786238523; cv=none; b=UbZWAvQBWHQYv3TwPyJg0pSg+9vMcyncbKMcdN1ZPZ//qSk2aGeUCVDaQJMxltkzZlfhMZtWYnf0l4/ZLnAJuDTxdbmqrRjtcbdfa+wx/kaKBQ2dBCZEe5oLKXUia9NqGVCmsmelUsOQRwVIdNJgnEHXXsmB4yP77p3IBWWZwwk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786238523; c=relaxed/simple; bh=pG2EJqvJW39D+h9h9ArybjUCm96CZ5wlCrX8uQvTdJo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KY567GMge3sl8yQxjsJ+y/I1tYKD9aZSlhTPRkdWcUTnVlFBBY5M6s/bQY9dsumLQH3Dm1nF6l8YsRi/VwBk2rajM5egRRD96zqOyqvbdVbk3QsybMbqWMhhe94HY4yniVd7uSs1PAmrb1jHTWBWAqjwTObapGIe5myDfXId/kQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=RtLyX1ZW; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="RtLyX1ZW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E6F9A1F00A3D; Sun, 9 Aug 2026 01:22:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786238521; bh=3ENzntdW9EbfTyuf4jLf1+izc0VArZVu+zn1scLccak=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RtLyX1ZWAaJmjjOpMfmM+BwbLatOP6COlju3S93mhPaOWS3YR7TQEbeFeJaQrS8bU 9uXFoc3A2ZE5OT9YgcyMyPLe+tIYjVkFUYCDspO4ig9KZFnT1Sx8ypRG+Aik3jnRf1 pG25k/hb0S1oqMICaW8mzCKUUAuPVn9lbIo0PmcAIsyGiUqBz56FhRenoLGyqSs45T GOp1t/Sb2y85bi5JVIrQTtRk1+QB0YRW4aFkRHzh3KSKVjAPl5fWohOfoBG/VImfl8 3sUpGE0NbLzMjLmKFW+SKuXxhbN8KGeLMKy4aZCWpQ3tvcyqcLVuWEgsyLnNNxTwIF DH3cKciooBTAQ== From: Sasha Levin To: stable@vger.kernel.org Cc: ZhangGuoDong , ChenXiaoSong , Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 6.6.y 2/7] smb: move get_rfc1002_len() to common/smbglob.h Date: Sat, 8 Aug 2026 21:21:53 -0400 Message-ID: <20260809012158.894446-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260809012158.894446-1-sashal@kernel.org> References: <2026072925-unloaded-borough-0d66@gregkh> <20260809012158.894446-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ZhangGuoDong [ Upstream commit 36c31540cf5279262bfd148d8537cd04866499f2 ] Rename get_rfc1002_length() to get_rfc1002_len(), then move duplicate definitions to common header file. Co-developed-by: ChenXiaoSong Signed-off-by: ChenXiaoSong Signed-off-by: ZhangGuoDong Acked-by: Namjae Jeon Signed-off-by: Steve French Stable-dep-of: cfc0b8e5080a ("ksmbd: validate minimum PDU size for transform requests") Signed-off-by: Sasha Levin --- fs/smb/client/cifsglob.h | 6 ------ fs/smb/client/cifssmb.c | 6 +++--- fs/smb/client/connect.c | 2 +- fs/smb/client/transport.c | 8 ++++---- fs/smb/common/cifsglob.h | 5 +++++ fs/smb/server/smb_common.h | 5 ----- 6 files changed, 13 insertions(+), 19 deletions(-) diff --git a/fs/smb/client/cifsglob.h b/fs/smb/client/cifsglob.h index 2c34ac9c57f8c..a4e0618c58efc 100644 --- a/fs/smb/client/cifsglob.h +++ b/fs/smb/client/cifsglob.h @@ -643,12 +643,6 @@ struct cifs_mnt_data { int flags; }; -static inline unsigned int -get_rfc1002_length(void *buf) -{ - return be32_to_cpu(*((__be32 *)buf)) & 0xffffff; -} - struct TCP_Server_Info { struct list_head tcp_ses_list; struct list_head smb_ses_list; diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 91f4e50af1e94..f83a30004a6b4 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -595,7 +595,7 @@ CIFSSMBEcho(struct TCP_Server_Info *server) iov[0].iov_len = 4; iov[0].iov_base = smb; - iov[1].iov_len = get_rfc1002_length(smb); + iov[1].iov_len = get_rfc1002_len(smb); iov[1].iov_base = (char *)smb + 4; rc = cifs_call_async(server, &rqst, NULL, cifs_echo_callback, NULL, @@ -1363,7 +1363,7 @@ cifs_async_readv(struct cifs_readdata *rdata) rdata->iov[0].iov_base = smb; rdata->iov[0].iov_len = 4; rdata->iov[1].iov_base = (char *)smb + 4; - rdata->iov[1].iov_len = get_rfc1002_length(smb); + rdata->iov[1].iov_len = get_rfc1002_len(smb); kref_get(&rdata->refcount); rc = cifs_call_async(tcon->ses->server, &rqst, cifs_readv_receive, @@ -1703,7 +1703,7 @@ cifs_async_writev(struct cifs_writedata *wdata, /* 4 for RFC1001 length + 1 for BCC */ iov[0].iov_len = 4; iov[0].iov_base = smb; - iov[1].iov_len = get_rfc1002_length(smb) + 1; + iov[1].iov_len = get_rfc1002_len(smb) + 1; iov[1].iov_base = (char *)smb + 4; rqst.rq_iov = iov; diff --git a/fs/smb/client/connect.c b/fs/smb/client/connect.c index fe5d21f174c47..68a000956d957 100644 --- a/fs/smb/client/connect.c +++ b/fs/smb/client/connect.c @@ -1230,7 +1230,7 @@ cifs_demultiplex_thread(void *p) * The right amount was read from socket - 4 bytes, * so we can now interpret the length field. */ - pdu_length = get_rfc1002_length(buf); + pdu_length = get_rfc1002_len(buf); cifs_dbg(FYI, "RFC1002 header 0x%x\n", pdu_length); if (!is_smb_response(server, buf[0])) diff --git a/fs/smb/client/transport.c b/fs/smb/client/transport.c index 1eb25603b6e83..a47242a0f5c6d 100644 --- a/fs/smb/client/transport.c +++ b/fs/smb/client/transport.c @@ -882,7 +882,7 @@ SendReceiveNoRsp(const unsigned int xid, struct cifs_ses *ses, int resp_buf_type; iov[0].iov_base = in_buf; - iov[0].iov_len = get_rfc1002_length(in_buf) + 4; + iov[0].iov_len = get_rfc1002_len(in_buf) + 4; flags |= CIFS_NO_RSP_BUF; rc = SendReceive2(xid, ses, iov, 1, &resp_buf_type, flags, &rsp_iov); cifs_dbg(NOISY, "SendRcvNoRsp flags %d rc %d\n", flags, rc); @@ -942,7 +942,7 @@ int cifs_check_receive(struct mid_q_entry *mid, struct TCP_Server_Info *server, bool log_error) { - unsigned int len = get_rfc1002_length(mid->resp_buf) + 4; + unsigned int len = get_rfc1002_len(mid->resp_buf) + 4; dump_smb(mid->resp_buf, min_t(u32, 92, len)); @@ -1462,7 +1462,7 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, goto out; } - *pbytes_returned = get_rfc1002_length(midQ->resp_buf); + *pbytes_returned = get_rfc1002_len(midQ->resp_buf); memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4); rc = cifs_check_receive(midQ, server, 0); out: @@ -1647,7 +1647,7 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, goto out; } - *pbytes_returned = get_rfc1002_length(midQ->resp_buf); + *pbytes_returned = get_rfc1002_len(midQ->resp_buf); memcpy(out_buf, midQ->resp_buf, *pbytes_returned + 4); rc = cifs_check_receive(midQ, server, 0); out: diff --git a/fs/smb/common/cifsglob.h b/fs/smb/common/cifsglob.h index eda5e666a7617..371160fec1cdf 100644 --- a/fs/smb/common/cifsglob.h +++ b/fs/smb/common/cifsglob.h @@ -40,6 +40,11 @@ struct smb_version_values { size_t create_posix_size; }; +static inline unsigned int get_rfc1002_len(void *buf) +{ + return be32_to_cpu(*((__be32 *)buf)) & 0xffffff; +} + static inline void inc_rfc1001_len(void *buf, int count) { be32_add_cpu((__be32 *)buf, count); diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index a364bf319a46d..612139bdc91b0 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -421,9 +421,4 @@ unsigned int ksmbd_server_side_copy_max_chunk_size(void); unsigned int ksmbd_server_side_copy_max_total_size(void); bool is_asterisk(char *p); __le32 smb_map_generic_desired_access(__le32 daccess); - -static inline unsigned int get_rfc1002_len(void *buf) -{ - return be32_to_cpu(*((__be32 *)buf)) & 0xffffff; -} #endif /* __SMB_COMMON_H__ */ -- 2.53.0