From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793831200; b=L3dDnU1gIJXYAM8X3tQMWYBG2OcSVpnfUAS3mnHpMrx9uYyx44gTA2RPK2n3FmmfNVoM McdhwPvw1gPHSGn3lfZpmygNRqdcMDjt3O7oMpGqJS/uAWIy/AVKaDQQLX8qdJCTA9A1M zkrVfORglLjL6sdgzAhin6YyY2vb8Ca6KzF0U9Insn+1kQaXJCkoodbewGPnLOJ0tYhzw eBPMOAfWUSqlpkGmwDI7UmbbEbnjyX9Sq0tbubJl7fIbrzlOH8iymwQospS+rQUOubP23 FYD2gpki5uHqXMwdyMRBe4+63sMKvFR6+XhiGdk70vu+T67hGBNXQp9MoJX0ZSeWBUA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793831200; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=RiuFNj48iIOoxJdsuV9SxxuLSWnw4lR7n8DC1GW/+IE=; b=yNg9tfsjj92lRbg7ygO7RCik/fyWqcV34QUIB/Q3Gx74iSJ0NvwD4VF5fUnL98qtdlGe k/1+R7GnoUIX+APIJEUkPduvzi4sHsuoqkr64QsrpCbFoAFGfS5pZjcV7oy5Hy0Jl/upP m7s/4hQtDR1oxYIsUdnem919352jpNKHIwM/AjKCUjedhWljCKZen0Klek31r6OTG4iY/ YrJGcJiDcHvv1KAwJdjEjhPJiUMUSgC0U4H1uUHq+V29pK99J+g7v7S198tLEL0C/nXZx 1n7s7ucmcLqx3SMKVNgi92c7dTrZ8gE8TaLFMKVEe96c9FF4JslnndyFGc8jAiDK05g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IGPteu80; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B358B606A847; Wed, 4 Nov 2026 22:26:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key, unprotected) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=IGPteu80 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08DE91F000C1; Wed, 4 Nov 2026 22:26:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1793831199; bh=RiuFNj48iIOoxJdsuV9SxxuLSWnw4lR7n8DC1GW/+IE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=IGPteu80lNz5CfgrVE2VFlwPGXy6EjumLCexFDdlzyMy6z8wYcc+knLxyVB1bAliZ FyER/YUZtwMV1M9N/DoDeteQDqk0S5z1X1U8Dd+pynSMnsmYKtpTyrAc1++gYgY5DS E0F+IV3MLSOunYkEf/8V8PbKEBZm5LP82ZNT+S3E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Yunpeng Tian , Mingda Zhang , Gongming Wang , Qinrun Dai , Namjae Jeon , Paulo Alcantara , Sasha Levin Subject: [PATCH 6.18 0560/1005] smb: client: reject SetEA requests that do not fit the request buffer Date: Wed, 4 Nov 2026 16:04:53 -0500 Message-ID: <20261104211059.578674367@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261104211043.516122098@linuxfoundation.org> References: <20261104211043.516122098@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yunpeng Tian [ Upstream commit 4aa2c106aef4bf3dfd97c30842db0767b26e8428 ] CIFSSMBSetEA() copies the caller's extended attribute value into the SMB request buffer without checking that it fits. The requirement is stated in the source but was never implemented: /*BB add length check to see if it would fit in negotiated SMB buffer size BB */ /* if (ea_value_len > buffer_size - 512 (enough for header)) */ if (ea_value_len) memcpy(parm_data->list.name + name_len + 1, ea_value, ea_value_len); The only bound applied on the way in is in cifs_xattr_set(): #define MAX_EA_VALUE_SIZE CIFSMaxBufSize ... if (size > MAX_EA_VALUE_SIZE) CIFSMaxBufSize is the full payload capacity of the buffer, so a value of exactly that size leaves no room for the SMB header, the TRANS2 parameter block, the fealist header and the EA name that are written ahead of it in the same object. SendReceive() already enforces the correct limit on this very length: if (in_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) but it is called after the copy has taken place. An unprivileged setxattr(2) on an SMB1 mount with a 250-byte name and a 16384-byte value writes 16384 bytes starting 345 bytes into a 16588-byte cifs_request object, ending 141 bytes past it: BUG: KASAN: slab-out-of-bounds in CIFSSMBSetEA+0xabc/0xde0 Write of size 16384 at addr ffff888003aa0159 by task init/68 __asan_memcpy+0x3c/0x60 CIFSSMBSetEA+0xabc/0xde0 cifs_xattr_set+0xd3a/0xff0 __vfs_setxattr+0x13e/0x1a0 The buggy address is located 345 bytes inside of allocated 16588-byte region Apply SendReceive()'s limit to the assembled request before the copy rather than after it, and widen the byte counters so the sum cannot wrap before it is tested. byte_count is also tested against U16_MAX, because it is stored in the 16-bit pSMB->ByteCount. That becomes reachable when CIFSMaxBufSize is raised at module load, where it may be set as high as 1024*127: with a 5-byte EA name and a 65521-byte value, count is exactly U16_MAX while byte_count is 65556, and cpu_to_le16() would truncate it to 20 and transmit a frame whose ByteCount does not match its length. Testing byte_count covers count as well, since byte_count is the larger of the two and count's only 16-bit consumer is written after this point. check_add_overflow() is evaluated first so that total_len is assigned before it is reported. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Yunpeng Tian Reported-by: Mingda Zhang Reported-by: Gongming Wang Reported-by: Qinrun Dai Cc: stable@vger.kernel.org Signed-off-by: Yunpeng Tian Reviewed-by: Namjae Jeon Signed-off-by: Paulo Alcantara [ sashal: Replaced the nonexistent in_len in the check_add_overflow() call with be32_to_cpu(pSMB->hdr.smb_buf_length) + 4, since header_assemble() here returns nothing. ] Signed-off-by: Sasha Levin --- fs/smb/client/cifssmb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/smb/client/cifssmb.c b/fs/smb/client/cifssmb.c index 0f293819d5e1f..88671e0a29295 100644 --- a/fs/smb/client/cifssmb.c +++ b/fs/smb/client/cifssmb.c @@ -6245,8 +6245,10 @@ CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, int name_len; int rc = 0; int bytes_returned = 0; - __u16 params, param_offset, byte_count, offset, count; + __u16 params, param_offset; + unsigned int byte_count, offset, count; int remap = cifs_remap(cifs_sb); + unsigned int total_len; cifs_dbg(FYI, "In SetEA\n"); SetEARetry: @@ -6297,6 +6299,14 @@ CIFSSMBSetEA(const unsigned int xid, struct cifs_tcon *tcon, pSMB->Reserved3 = 0; pSMB->SubCommand = cpu_to_le16(TRANS2_SET_PATH_INFORMATION); byte_count = 3 /* pad */ + params + count; + if (check_add_overflow(be32_to_cpu(pSMB->hdr.smb_buf_length) + 4, + byte_count, &total_len) || + byte_count > U16_MAX || + total_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE) { + cifs_dbg(VFS, "EA request too large: %u bytes\n", total_len); + cifs_buf_release(pSMB); + return -E2BIG; + } pSMB->DataCount = cpu_to_le16(count); parm_data->list_len = cpu_to_le32(count); parm_data->list.EA_flags = 0; -- 2.53.0