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 93500212564; Sun, 7 Jun 2026 10:38:36 +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=1780828717; cv=none; b=StzI6FbrzG/Ux1rJUUt5F7F8KeUbmRpg6W32B1eT6/nneW+XcFwZ/MUgPiUj7ZOPIp3CYkLUIsiH3eBZJzjnPMAbvkBwTjhHXIjoVQZNgGsPitxG64eiPGTxg+aLXBf5nEqJxb8ISVxK1Rit6ac7Tg4mj6z3m/omHW3KxeC17ws= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780828717; c=relaxed/simple; bh=Sqv/a7dvJ6oC8imSVOVswOkj2TSOqBeLOd/a8maADJ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MHprVm8whRLbbDp/OuP5jSJX/62JmaMvMvqZZeHf5YqAiR8CKTEMPHdGyFhizAAU3WZMMcDek/cgpUmm+lIF5OCg0lUbuoQXOCPCEunvcoMifL/80b3Cs2DOB2B9Cm0Cj/xB5rh1BN/Szo/yMsC96mUwPIOBo0R9y5WjggBadXI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=VJ+Wbtak; 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="VJ+Wbtak" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8B301F00893; Sun, 7 Jun 2026 10:38:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780828716; bh=iN7ZTCmU3Jbes7iS/dF2kKsgzzCZg1jmkadcpcMAXqY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=VJ+WbtakSGB7diChhDTbMUlBWgyhagl6/WRemXpigpn3coevTzODh7otaT6xb2vyy gqHWq9T9EbYOzRxus4nV76s5b1kp2OhrrbJLvvg8gsm0m35MhXvYn/2ffNRlDMkLYc xGoUJG1IRPnV3E/JsfO+hRmue0mN73ycarpQ2ihs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable@kernel.org, Yuan Tan , Zhengchuan Liang , Xin Liu , Yuqi Xu , Ren Wei , Jakub Kicinski Subject: [PATCH 6.18 185/315] bpf: sockmap: fix tail fragment offset in bpf_msg_push_data Date: Sun, 7 Jun 2026 11:59:32 +0200 Message-ID: <20260607095734.375000702@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260607095727.528828913@linuxfoundation.org> References: <20260607095727.528828913@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Yuqi Xu commit f72eed9b84fb771019a955908132410a9ba9ea3f upstream. When bpf_msg_push_data() inserts data in the middle of a scatterlist entry, it splits the original entry into a left fragment and a right fragment. The right fragment offset is page-local, but the code advances it with `start`, which is the message-global insertion point. For inserts into a non-first SG entry, this over-advances the offset and leaves the split layout inconsistent. Advance the right fragment offset by the fragment-local delta, `start - offset`, which matches the length removed from the front of the original entry. Fixes: 6fff607e2f14 ("bpf: sk_msg program helper bpf_msg_push_data") Cc: stable@kernel.org Reported-by: Yuan Tan Reported-by: Zhengchuan Liang Reported-by: Xin Liu Signed-off-by: Yuqi Xu Signed-off-by: Ren Wei Link: https://patch.msgid.link/8b129d10566aa3eb43f61a8f9757bcf51707d324.1779636774.git.xuyq21@lenovo.com Signed-off-by: Jakub Kicinski Signed-off-by: Greg Kroah-Hartman --- net/core/filter.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2859,7 +2859,7 @@ BPF_CALL_4(bpf_msg_push_data, struct sk_ psge->length = start - offset; rsge.length -= psge->length; - rsge.offset += start; + rsge.offset += start - offset; sk_msg_iter_var_next(i); sg_unmark_end(psge);