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 40B952E8B64 for ; Mon, 30 Mar 2026 14:40:45 +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=1774881645; cv=none; b=ACwLKtTZcHfOkmD2Kq9dL8HQeRidoIsvi/MfJkh9F4mNjQVJkR11R79dUMwZoqtoP4+lTvELNiScAzBhhjpWXMUHRzelQ9lIejBMkhk7k0Bu+7sLYdP0UFAQnrg0J+05Xgs17v/XQlwa2mXonrDlEHSql6qMI8jus/8fdBADnAA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774881645; c=relaxed/simple; bh=MSE1WROHq0BwUZ43e7DNNfNNJ0wZPW+H4Al/u7VOLng=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QM5leJ4D2Qevu9/x99UyNhaD0y5otdAwsmrZEyMVw6pRSYSdRxM2mpPUMwNLb0iCKBX+1jsPGhXYNKGZyTL/epBI15JBo/Dg5S71A5DHigJHySicQACFycHz1UyAX7p2FNSlIxRM3IPsknaUtSajUBBLA6US7WUkmqBn5A8ZE8c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=fCyNhWC7; 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="fCyNhWC7" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6742EC4CEF7; Mon, 30 Mar 2026 14:40:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1774881644; bh=MSE1WROHq0BwUZ43e7DNNfNNJ0wZPW+H4Al/u7VOLng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fCyNhWC7oNSV9cBL5g0rrZxHlqdNN3lAxSsY5FhEuQWAAWyVtqx6BgNirf2/sIJxA g9EFrBkB8m20PWgiHLOvB85wrwRal9dSvWNkNaQxhcjZkrnYBafZp3at3NLgQhX3E4 GCcl7VwACaKemT0MKBUhD3ykWOn6v5WL0kkMUSXaEeztjfvm94qAYDPl6fRZPdghOc Ql31Cfmh402vXX8qBrLwD65/TQmDRTcWDgkaczUs6srWXUjbhiovJVWfczmMfTxEL+ WtKX+ISwr1ta79on6RyHE3YX5TRWAJah9MYNlOieiVsLcF4DkqYSamaQ8p70wmbvMQ guYkuBYQc2OJg== From: Sasha Levin To: stable@vger.kernel.org Cc: Namjae Jeon , Steve French , Sasha Levin Subject: [PATCH 5.15.y] ksmbd: replace hardcoded hdr2_len with offsetof() in smb2_calc_max_out_buf_len() Date: Mon, 30 Mar 2026 10:40:42 -0400 Message-ID: <20260330144043.880361-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026032959-lapping-dude-6fa0@gregkh> References: <2026032959-lapping-dude-6fa0@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: Namjae Jeon [ Upstream commit 0e55f63dd08f09651d39e1b709a91705a8a0ddcb ] After this commit (e2b76ab8b5c9 "ksmbd: add support for read compound"), response buffer management was changed to use dynamic iov array. In the new design, smb2_calc_max_out_buf_len() expects the second argument (hdr2_len) to be the offset of ->Buffer field in the response structure, not a hardcoded magic number. Fix the remaining call sites to use the correct offsetof() value. Cc: stable@vger.kernel.org Fixes: e2b76ab8b5c9 ("ksmbd: add support for read compound") Signed-off-by: Namjae Jeon Signed-off-by: Steve French [ adapted `req->CtlCode` field access to `req->CntCode` ] Signed-off-by: Sasha Levin --- fs/ksmbd/smb2pdu.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/fs/ksmbd/smb2pdu.c b/fs/ksmbd/smb2pdu.c index b5ff4c855f9cb..5ab44bd22fd1b 100644 --- a/fs/ksmbd/smb2pdu.c +++ b/fs/ksmbd/smb2pdu.c @@ -4107,8 +4107,9 @@ int smb2_query_dir(struct ksmbd_work *work) d_info.wptr = (char *)rsp->Buffer; d_info.rptr = (char *)rsp->Buffer; d_info.out_buf_len = - smb2_calc_max_out_buf_len(work, 8, - le32_to_cpu(req->OutputBufferLength)); + smb2_calc_max_out_buf_len(work, + offsetof(struct smb2_query_directory_rsp, Buffer), + le32_to_cpu(req->OutputBufferLength)); if (d_info.out_buf_len < 0) { rc = -EINVAL; goto err_out; @@ -4358,8 +4359,9 @@ static int smb2_get_ea(struct ksmbd_work *work, struct ksmbd_file *fp, } buf_free_len = - smb2_calc_max_out_buf_len(work, 8, - le32_to_cpu(req->OutputBufferLength)); + smb2_calc_max_out_buf_len(work, + offsetof(struct smb2_query_info_rsp, Buffer), + le32_to_cpu(req->OutputBufferLength)); if (buf_free_len < 0) return -EINVAL; @@ -4656,8 +4658,9 @@ static void get_file_stream_info(struct ksmbd_work *work, file_info = (struct smb2_file_stream_info *)rsp->Buffer; buf_free_len = - smb2_calc_max_out_buf_len(work, 8, - le32_to_cpu(req->OutputBufferLength)); + smb2_calc_max_out_buf_len(work, + offsetof(struct smb2_query_info_rsp, Buffer), + le32_to_cpu(req->OutputBufferLength)); if (buf_free_len < 0) goto out; @@ -7697,8 +7700,9 @@ int smb2_ioctl(struct ksmbd_work *work) buffer = (char *)req + le32_to_cpu(req->InputOffset); cnt_code = le32_to_cpu(req->CntCode); - ret = smb2_calc_max_out_buf_len(work, 48, - le32_to_cpu(req->MaxOutputResponse)); + ret = smb2_calc_max_out_buf_len(work, + offsetof(struct smb2_ioctl_rsp, Buffer), + le32_to_cpu(req->MaxOutputResponse)); if (ret < 0) { rsp->hdr.Status = STATUS_INVALID_PARAMETER; goto out; -- 2.53.0