From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 50AA329D28F for ; Fri, 24 Apr 2026 16:20:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777047617; cv=none; b=jzxM3L/DdjlwNVub+gBvZCdLRxOuAp8w7C9Mn0dYge0Qu0kyP6why+TYpcXOtimc0XfpOKw/lwUONJoIfSnvYl5Pk87q8Dbdo7xg7KkhRweuWEbpbzh1EMTF6V9mLVgXOIYjPhHcDB91qqzTCjzv/wZ6HU/EhvQbI5Suqfr85xo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777047617; c=relaxed/simple; bh=mb/0TtlHB/X5dX4Be+rHeXhKIp3DPEOpDFe3p1oAGwk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mKEHGyAthFQnrwGd6gskkKb3O8ft008ZIqYEREiVqNpnsKvR5lQIZGAz8tIx0YvJBHP/nBvrFo7BumuhPpyCioluihgHRnXIHJoZsUqqfBegYZtXXw89ClSX4gmM6Y8ZD0Yp1qz0FN/C3cTJFwPwPk3Uf48TOjl/VFyOy6vPxEc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=EaXQ+wFO; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EaXQ+wFO" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5B138C19425; Fri, 24 Apr 2026 16:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1777047616; bh=mb/0TtlHB/X5dX4Be+rHeXhKIp3DPEOpDFe3p1oAGwk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EaXQ+wFOtsHgpqtju9zj7NfIBXVrgvS0hY+lRS/moi/dJNaL/5CIAj6ja9ZeEGPmm GA6+lbjt5I7m2DYVPufomJExNoY4K58mmtozbmG+oZYG1EJaOLlTJGf8EfqPjXCQYE xZCICs/2f3Z3mf6y68TEwROtdVHcyMRYJlhh+xtuLRmbRy8HYie852IyKkCW5zNlAk 34farnYuRioXhwbqHXkyFe45bKhAfBMchcOCWe1T3avxRGHObk4VJkwJMwwyvq2Kst QBC21MECfqIY+YzaDcDuM3Sy5bQ7ZDYDc+u8LeFNs+GhRfG9efTzrRZ3xU/QjiyYmN RsQ4ZI5NpTf5Q== From: Sasha Levin To: stable@vger.kernel.org Cc: Michael Bommarito , Steve French , Sasha Levin Subject: [PATCH 5.10.y] smb: client: fix OOB read in smb2_ioctl_query_info QUERY_INFO path Date: Fri, 24 Apr 2026 12:20:14 -0400 Message-ID: <20260424162014.2284352-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026042459-unsworn-that-7ba2@gregkh> References: <2026042459-unsworn-that-7ba2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Michael Bommarito [ Upstream commit a58c5af19ff0d6f44f6e9fe31e33a2c92223f77e ] smb2_ioctl_query_info() has two response-copy branches: PASSTHRU_FSCTL and the default QUERY_INFO path. The QUERY_INFO branch clamps qi.input_buffer_length to the server-reported OutputBufferLength and then copies qi.input_buffer_length bytes from qi_rsp->Buffer to userspace, but it never verifies that the flexible-array payload actually fits within rsp_iov[1].iov_len. A malicious server can return OutputBufferLength larger than the actual QUERY_INFO response, causing copy_to_user() to walk past the response buffer and expose adjacent kernel heap to userspace. Guard the QUERY_INFO copy with a bounds check on the actual Buffer payload. Use struct_size(qi_rsp, Buffer, qi.input_buffer_length) rather than an open-coded addition so the guard cannot overflow on 32-bit builds. Fixes: f5778c398713 ("SMB3: Allow SMB3 FSCTL queries to be sent to server from tools") Cc: stable@vger.kernel.org Signed-off-by: Michael Bommarito Assisted-by: Claude:claude-opus-4-6 Assisted-by: Codex:gpt-5-4 Signed-off-by: Steve French Signed-off-by: Sasha Levin --- fs/cifs/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 5e11362ecc47e..c1ffd51173c5d 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -1720,6 +1720,12 @@ smb2_ioctl_query_info(const unsigned int xid, qi_rsp = (struct smb2_query_info_rsp *)rsp_iov[1].iov_base; if (le32_to_cpu(qi_rsp->OutputBufferLength) < qi.input_buffer_length) qi.input_buffer_length = le32_to_cpu(qi_rsp->OutputBufferLength); + if (qi.input_buffer_length > 0 && + struct_size(qi_rsp, Buffer, qi.input_buffer_length) > + rsp_iov[1].iov_len) { + rc = -EFAULT; + goto out; + } if (copy_to_user(&pqi->input_buffer_length, &qi.input_buffer_length, sizeof(qi.input_buffer_length))) { -- 2.53.0