From mboxrd@z Thu Jan 1 00:00:00 1970 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 62FDE26F288; Sat, 30 May 2026 16:49: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=1780159742; cv=none; b=cXbVgM5uoFTTmfiWuxEu+5cUVsaKwltyhL5LyzfhJA7eJr4DlAClHE5QJJizcTQ6aTN9Pp4+jYZW4TktzTW3GCi/DPp1oWstndseCbKVxGlHDxb47vjhSqzFtmskJ7GkTpn8feEN9vzebvUzIhLuIfSTA5Xk9tRt5M9filk4hfs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780159742; c=relaxed/simple; bh=qRTtWejyahEDAOL8jNDItAxZJ2zpds6J/krK374DF1U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Eznv9MGbht7xvQsbD+8I/8rLH/4yYghuT0RvFJv54C/AgQUCUO/ZvYYMEVPxRuiHpqddG5SHurD74w7RrmVN8hJtD9FfdB9477fZ8QDIV7H8XJbF3cVWS7lKwXwwamel6teY4lM6M+ajWu5XsE+41lqfS6A5k8VE8JB+S+NFNnM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gtZdfatg; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="gtZdfatg" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 944671F00893; Sat, 30 May 2026 16:49:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780159741; bh=hQ7eotPJu2uMJvs8RlZ3PuOlqwGi5in5WcRTmyItEWQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=gtZdfatgIAcCtIRPX7Pugd5dpVczqEnW5Qvstv9nNRuiIByVJGVhvKWOij6izPbmm YP8vuqSeCP+1CjLZmML9QfNDxIgweX+Gg+6UB6E/no1M9qW/Gj0ufa1P3uC5dL4mm+ sSy5XciEC2oigDvT2v6vvN2TMl16pIxsP0W6QI2E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Michael Bommarito , Steve French Subject: [PATCH 6.1 149/969] smb: client: fix OOB read in smb2_ioctl_query_info QUERY_INFO path Date: Sat, 30 May 2026 17:54:33 +0200 Message-ID: <20260530160304.666531888@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160300.485627683@linuxfoundation.org> References: <20260530160300.485627683@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Bommarito commit a58c5af19ff0d6f44f6e9fe31e33a2c92223f77e upstream. 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: Greg Kroah-Hartman --- fs/smb/client/smb2ops.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -1701,6 +1701,12 @@ smb2_ioctl_query_info(const unsigned int 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))) {