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 61D5132F770; Sat, 30 May 2026 18:37:21 +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=1780166242; cv=none; b=JUbXWROPNHXWQ2+dQYoVeOUtPx5xFwLeHE4VHw0DHHBM2I5xe7U7sKeb8zCMNTGLjcUFUs4X0L3Vv21cUImhAoVz/mbnu0vkM6kIbu5mPh1kQz8K2HePXiNJh6/I5ao7O+gUJKQFeAwmgqQehjN47U4nA7ZdVHuQQcSj/SII+KA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780166242; c=relaxed/simple; bh=9liQSpPu9wH2kRDDQbPEhh8xtB8EKjCHu9tAsSsJ7Qk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rck9pKM5C88wq2xiKUIrSO753vSCDGWIJN35asXBQ+q575IhAzF9Fi2LumFIEmtWko3SkUOGAnbNriLVkldchofcNKCK++4Z7VrYNWjQ6s8RHa7ep9eWH/4zawnTYWYRIjmCthB6cYe1+6nX331B9fPLND2EUpNXWH69BRte/+U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=zxAtjQ1n; 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="zxAtjQ1n" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A6B5F1F00893; Sat, 30 May 2026 18:37:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1780166241; bh=6cwKwqw5dxY5GmRPLbu76UjJ7+vjbhGMhhMfOTBCJKA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=zxAtjQ1n4ymUu/LQHfEAwiBWaSRk10NGO+Ygo1RW1WAAaU9dQ64g2Yl6ZCLoN0YmU AJSZyPQ2o1B4jTQNu/cz88m36I+hD8C1CjerP1P9dNFyZ0zuxvzHmGKWuqzs2FlZVl KIbPtibHJAQ52wrv6JFbtt+jJy5pkfiHUJwX7re0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com, Sun Jian , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.10 314/589] bpf: reject short IPv4/IPv6 inputs in bpf_prog_test_run_skb Date: Sat, 30 May 2026 18:03:15 +0200 Message-ID: <20260530160233.192205681@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260530160224.570625122@linuxfoundation.org> References: <20260530160224.570625122@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 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sun Jian [ Upstream commit 12bec2bd4b76d81c5d3996bd14ec1b7f4d983747 ] bpf_prog_test_run_skb() calls eth_type_trans() first and then uses skb->protocol to initialize sk family and address fields for the test run. For IPv4 and IPv6 packets, it may access ip_hdr(skb) or ipv6_hdr(skb) even when the provided test input only contains an Ethernet header. Reject the input earlier if the Ethernet frame carries IPv4/IPv6 EtherType but the L3 header is too short. Fold the IPv4/IPv6 header length checks into the existing protocol switch and return -EINVAL before accessing the network headers. Fixes: fa5cb548ced6 ("bpf: Setup socket family and addresses in bpf_prog_test_run_skb") Reported-by: syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=619b9ef527f510a57cfc Signed-off-by: Sun Jian Link: https://lore.kernel.org/r/20260408034623.180320-2-sun.jian.kdev@gmail.com Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- net/bpf/test_run.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 027d6ba8c154c..e97e09a424e5f 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -611,19 +611,23 @@ int bpf_prog_test_run_skb(struct bpf_prog *prog, const union bpf_attr *kattr, switch (skb->protocol) { case htons(ETH_P_IP): - sk->sk_family = AF_INET; - if (sizeof(struct iphdr) <= skb_headlen(skb)) { - sk->sk_rcv_saddr = ip_hdr(skb)->saddr; - sk->sk_daddr = ip_hdr(skb)->daddr; + if (skb_headlen(skb) < sizeof(struct iphdr)) { + ret = -EINVAL; + goto out; } + sk->sk_family = AF_INET; + sk->sk_rcv_saddr = ip_hdr(skb)->saddr; + sk->sk_daddr = ip_hdr(skb)->daddr; break; #if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): - sk->sk_family = AF_INET6; - if (sizeof(struct ipv6hdr) <= skb_headlen(skb)) { - sk->sk_v6_rcv_saddr = ipv6_hdr(skb)->saddr; - sk->sk_v6_daddr = ipv6_hdr(skb)->daddr; + if (skb_headlen(skb) < sizeof(struct ipv6hdr)) { + ret = -EINVAL; + goto out; } + sk->sk_family = AF_INET6; + sk->sk_v6_rcv_saddr = ipv6_hdr(skb)->saddr; + sk->sk_v6_daddr = ipv6_hdr(skb)->daddr; break; #endif default: -- 2.53.0