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=1792706706; b=l2OCPnUw//n+BOMjWTZ6razPO9bqVo+uQh2cOoHs3NkvHO7nHlppd6hQZdNhzaFsbRmU o86FTA8n0f6zmx32eHVEhKaYl3adlT6iYCglGS+b/bxc+e3X1m7WTdkhUEPrnkqhIsCBY gaE+WrokDtb5rhsiSh8NpdZpm/wAFsahJW51djd62BrwEAz08vBfjNpb9MjXjxFhfNMyZ 0/iQAfvE9sowSQr895sU6q+MMIoq5vThciYPwVvKZMrnxPS7Vtszib2qJJAkHfBYmRy+m lxWlvLHbeldS1srNDoBQjU+Z8QlX+Hu0oGFShyb4dZkTXZ+5VKKwwEZUtiCUzvXZXrw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792706706; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=JdNlzrnpQC2chE2KOqc35DIqlebtBC9xIz9SYsp78YY=; b=3s3o5aYV68dXflHyhC1qasd8GjouNI4ReBwco/g17k2BOT1y79v43mRY8oNzrqAzyt4l sudRCKwZDHQ3/+P5ux5U7Jnap+XSnXKIOVe6gDlJ6hEg/nGtPbY3r/tDkkBpIspRvNOe1 abhXq7hQTnG73uqTHG15EiqihPU7nGzRj0M2ldmPauqk2fs+/2bcaZmAex1VS9PyZCp1h /g/jxIExVsukTBgJdM1S9cj4l24BJOgpjtnaNvXIX8nqYBlWpw8mbk40Gsf30eR/HzqSK 3If7CbqvFcFgEbx0frCNo2cHD63z5X7NPWzmeBiBgLILsz6myfSmYDyL1ujxPrer0UQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VoW+F05A; 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 43909606A31E for ; Thu, 22 Oct 2026 22:05:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=VoW+F05A Received: by smtp.kernel.org (Postfix) with ESMTPSA id 44CD31F01825; Thu, 22 Oct 2026 22:05:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1792706706; bh=JdNlzrnpQC2chE2KOqc35DIqlebtBC9xIz9SYsp78YY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VoW+F05AhYsKYL5lCMuK/zEmVLq3fXHB4IF1umra6S6tU/p3LlX/83+vi70LdHi9z a1bFz5rhMcI+s9hruGOreWcGfl3ng8Gv9Ids1KsrATDDCx61wRGD0/vvnmiCgiLmU0 MmWehU8nWvCn6EiVtHBcsjgmL75OnExgTy5T4Q9IBtHH1FhGiv/V/wcpx2u8Q+Svdp H2IjMvBpYoyEtYyUMaHz1kpwwuYAyCTPIfSVEnEKo/dsm2//xXsh7CWESv5RNKXQu0 IHmnR+gBN73UCWaVSSi7QiCLRgq46ULsC15iOoedqJU8hf6hQcaCoRZH0f8/FE1ayG hI9gyvU83uf7Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Yunpeng Tian , Mingda Zhang , Gongming Wang , Qinrun Dai , Namjae Jeon , Paulo Alcantara , Sasha Levin Subject: [PATCH 5.15.y] smb: client: reject SetEA requests that do not fit the request buffer Date: Thu, 22 Oct 2026 18:05:04 -0400 Message-ID: <20261022220237.1993024-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026102229-snack-quotable-d6f5@gregkh> References: <2026102229-snack-quotable-d6f5@gregkh> X-Mailing-List: stable@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 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 in_len with get_rfc1002_length(pSMB), adjusting the buffer limit to exclude the four-byte framing header. ] Signed-off-by: Sasha Levin --- fs/cifs/cifssmb.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index 11a400663b9f2..06bc11817284a 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c @@ -6227,8 +6227,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: @@ -6279,6 +6281,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(get_rfc1002_length(pSMB), byte_count, + &total_len) || + byte_count > U16_MAX || + total_len > CIFSMaxBufSize + MAX_CIFS_HDR_SIZE - 4) { + 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[0].EA_flags = 0; -- 2.53.0