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=1795061835; b=grS5OVMLFXNLmRhWxZUlM2YNzdrPsBP7R2kWghwUx4IxWFwpk8EpsxosuBSC4OWD1Q+t Wg4mXrSHX5/kylolc3/2xV6f6BOakjoiGAHXjtP+x+gV9kJfs+YI2qyVyqzQWrQafy2T3 sBgOplJD5wA0h6k1JyolavVDi+g9QN6RwtRDm8s4Q03aoxBumhRygP/rr0RJbAPDKT5Wb adJp9Gdu4Pf8dR0ARZ8Hs97YetopKM8bFwGHmkKSmCcrWF5VrS45ule7+uBqJCMVnmLWw OD14Z+OL+c/Vpz8hiw8JFUirH0vW0etRgKTHE6aCSBrVP8f7HcF+Z2BpPXYxHgxcPVw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795061835; 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=KZ0uSHxPLQkA8AFn3V0pfX3Xfn8XNPCPoa5H0+HYbGo=; b=wihR2orZSaLHpghtKcdxUci63tKIwO0tX6B+G3VqbCLlXY7CcI+oamcXB/ZGENGMKCkY qS76SdmLwAH4wQbv1pEChU3pE89urgjkQMSRzZxpdeunjnqY+WyHQqhoQeQOfYqABUxy5 QbkCEyJo0xMuNm0RDF3GVJhwPjilqHKBS6ikFVkYBz6mqhR/UIJpOGwWU1gdLTmlaf2PI jlqUtFlgbVYfsroY4g3kAPjg4surmUbPTkM4r8NOglwfn0rAvC0XLc7/RqDNFqU5KJQXh btwlugzMZHadPuKbIoNVH5tlL9I4/k4aUYrcECVaVDdhA+WVauLckhYJ7pXjEuzWpLw== 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=vV3eZRkL; 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 D0751606A339; Thu, 19 Nov 2026 04:17:15 +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=vV3eZRkL Received: by smtp.kernel.org (Postfix) with ESMTPSA id 31DE01F000C5; Thu, 19 Nov 2026 04:17:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795061835; bh=KZ0uSHxPLQkA8AFn3V0pfX3Xfn8XNPCPoa5H0+HYbGo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vV3eZRkLCYdRr6Nlc3YRwSxMHCkaVo9c2Tx1nTOdlSue4eVyNW+rnL4jY6ww1BCV+ lWnTVH5qg5qml1u05JoRDcmw8ufi4+HRO3EV7MHbTG8H2c36hee7yxfOiLnWFklMpr GxR9SZPZDze9I4CoR9x/tQHDtS+IvyElNNMhbmGk= 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.10 1696/1848] bpf: Validate the SRH which End.DT6 uncovers in End.BPF Date: Wed, 18 Nov 2026 16:02:14 +0100 Message-ID: <20261118150030.763080503@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118145911.150052362@linuxfoundation.org> References: <20261118145911.150052362@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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit e8b084646b946cc6f7976365588035947a296184 ] input_action_end_bpf() validates the SRH of a packet and pulls it into the head before the program runs. If the program decapsulates the packet with bpf_lwt_seg6_action(SEG6_LOCAL_ACTION_END_DT6), bpf_update_srh_state() looks for a routing header in the inner packet and takes it for the new SRH as it is. Nobody has looked at that header, and whoever has sent the packet has written it. ipv6_find_hdr() finds it in a fragment of the skb as well, but hdrlen is then read at that offset from skb->data, past the end of the head. The header need not be an SRH, and its hdrlen need not fit into the packet, but it is marked as valid, and bpf_lwt_seg6_adjust_srh() and bpf_lwt_seg6_store_bytes() check their offsets against it. A program which then adds a TLV at the end of the SRH, where hdrlen has it, makes bpf_lwt_seg6_adjust_srh() move and write memory behind the head of the skb, as far as the sender likes within the 2 KB that hdrlen can say: BUG: KASAN: slab-out-of-bounds in bpf_skb_net_hdr_push+0x185/0x240 Read of size 2088 at addr ffff888107d6f09e by task srh/102 BUG: KASAN: slab-out-of-bounds in bpf_skb_net_hdr_push+0x1b5/0x240 Write of size 8 at addr ffff888107d6f8be by task srh/102 Use seg6_get_srh(), which pulls and validates the header. Without a valid SRH the state says that there is none, and the packet goes its way as before. The pull can move the head, so compute the data pointers behind it. 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-12-alexei.starovoitov@gmail.com Signed-off-by: Sasha Levin --- net/core/filter.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/core/filter.c b/net/core/filter.c index aa3fa288e9026..dcce1f963dbdb 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -5862,15 +5862,15 @@ static void bpf_update_srh_state(struct sk_buff *skb) { struct seg6_bpf_srh_state *srh_state = this_cpu_ptr(&seg6_bpf_srh_states); - int srhoff = 0; - if (ipv6_find_hdr(skb, &srhoff, IPPROTO_ROUTING, NULL, NULL) < 0) { - srh_state->srh = NULL; - } else { - srh_state->srh = (struct ipv6_sr_hdr *)(skb->data + srhoff); + /* Behind a decapsulation this is a header that nobody has looked at */ + srh_state->srh = seg6_get_srh(skb, 0); + if (srh_state->srh) { srh_state->hdrlen = srh_state->srh->hdrlen << 3; srh_state->valid = true; } + /* it may have been pulled into the head */ + bpf_compute_data_pointers(skb); } BPF_CALL_4(bpf_lwt_seg6_action, struct sk_buff *, skb, -- 2.53.0