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=1795056535; b=IwquW56IFy2AAm/dntyATo1CANGKLxZujB5rIbAjDiaOf+umsI9vV5NeUTGobiQ+3Ewz tz8RQkOtiYJnJOaIdm96M0XK/zI9j1vRPlUK8j+MY5ehQpWPOe9aK0NNWw4MYOTp9+ns1 4meIY+dMcvMXxcOkkGpVYdwNR1xZLDO24AZBdO72dKOLveHRLUVO12Hb1x5KBk5rb/jCD W/gqwxGkBzUylSwIdx/60izRoRjUNM5a4ok+c/bv8Ksc0tX2qrXwuoPmZ85IaT80DIB7d WqWQSehLKFbdFx8iTntPGxPwCG85YD2HGxSUOXqtRd3GRF7ARF1CW//jWskWCQCqq6g== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795056535; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=AKWJrro79u6pCe7W9s9+9ieTfChNHyvyibfSI1m4XDU=; b=GUs6ZB+VWcvfMHccGbqopUuKNTXtnodXWG0h/8cl75lmBypUfAGlw/lbINBX8ha/8iES uBtl9EmcxZoxlM1PtQety2/5cWXAKNcUiU3Kyu5wa2UyiGYyl+G4H8tiRV2NdRxwwqpf5 NCEn5jI2M/QfJkq7npi7Ycf5kIYzAujbgW43ZzIgBtCy/63XMH6aoQbydRfd2HmIaySH7 EfAJoX/GrCryXSWNFPxa/1mNpwa8IUVnKfdPm1htpDl7EyUmu02Chyot48xpSEzJ/VuzI K7zkndM6pBEMIMxu70fDgmnNBMY/L1VLjo8JuELEGgMFmTzwraGG9METTKyO5VdoXgQ== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=jHeeb0NB; 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 6B442606A320; Thu, 19 Nov 2026 02:48:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=jHeeb0NB Received: by smtp.kernel.org (Postfix) with ESMTPSA id B89751F000C5; Thu, 19 Nov 2026 02:48:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795056535; bh=AKWJrro79u6pCe7W9s9+9ieTfChNHyvyibfSI1m4XDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jHeeb0NBF/tAMxXKJtRD3qVjy0kNHje7n+Rr07qhdnnJGxcyi0fUODkc6UfGNIsur nXS8mt7na+CxQ4hnxr2SGdVitC2RSouE6QX9/XHqzSETfBeqoiLQ3wFJDRel6ycViz 9A2nkTl+K9stuuZdFeGJ9akznnty1BZhKT9s7e5Q= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.15 2021/2214] bpf: Pull the inner header for End.DT6 in End.BPF Date: Wed, 18 Nov 2026 16:01:37 +0100 Message-ID: <20261118150131.586983209@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150009.797899913@linuxfoundation.org> References: <20261118150009.797899913@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit 434324c611a98bc76dc850d45d67756dae5622cf ] bpf_lwt_seg6_action(SEG6_LOCAL_ACTION_END_DT6) pulls the outer headers off the packet and hands it to seg6_lookup_nexthop(), which reads the inner IPv6 header at skb->data. Nothing says that this header is in the head of the skb, or that there is one. If the head ends with the outer headers, the route is looked up for whatever lies behind the head, and the packet is dropped or leaves by the wrong route. If the program then pushes an SRH with SEG6_LOCAL_ACTION_END_B6, seg6_do_srh_inline() pulls an IPv6 header off a head which has none, and __skb_pull() hits its BUG(): the kernel panics on a packet from the network. GRO pulls the inner header of a plain IPv6 in IPv6 packet into the head. It takes a packet which GRO does not look into that far, one with a fragment header in front of the inner header for example, or a device without GRO, and a driver which leaves the inner header in a fragment. Make sure of the inner header together with the outer ones. The program goes on behind an error of the helper, so do it before the packet is changed. A pull which fails can still have moved the head, so look for the SRH again. Fixes: 486cdf21583e ("bpf: add End.DT6 action to bpf_lwt_seg6_action helper") Signed-off-by: Josef Bacik Signed-off-by: Alexei Starovoitov Link: https://patch.msgid.link/20261017163745.3341787-13-alexei.starovoitov@gmail.com Signed-off-by: Sasha Levin --- net/core/filter.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/core/filter.c b/net/core/filter.c index cb87f1eb5ab0f..a3712d4068e8f 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6252,9 +6252,14 @@ BPF_CALL_4(bpf_lwt_seg6_action, struct sk_buff *, skb, if (ipv6_find_hdr(skb, &hdroff, IPPROTO_IPV6, NULL, NULL) < 0) return -EBADMSG; - if (!pskb_pull(skb, hdroff)) + /* As long as nothing has been changed, the program goes on */ + if (!pskb_may_pull(skb, hdroff + sizeof(struct ipv6hdr))) { + /* but the head may have moved */ + bpf_update_srh_state(skb); return -EBADMSG; + } + __skb_pull(skb, hdroff); skb_postpull_rcsum(skb, skb_network_header(skb), hdroff); skb_reset_network_header(skb); skb_reset_transport_header(skb); -- 2.53.0