From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy1-f173.google.com (mail-dy1-f173.google.com [74.125.82.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7FCB528643C for ; Thu, 2 Apr 2026 16:02:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145730; cv=none; b=sJTB8ENDdOJCXdPjQFV1LR3zOyUciB4vC91Z1ohwkCQ7sSxEWc2CXsxFmylw9biLJMc35hwiPPeOBFouUOR7nCUJgQVg8wfc4gNTzavpo5A2RoKYdBISfj/ubIO6RaDO+DK3vUzSjUO0Yfrs9yiHVWzBuFzSHduyo6J7fbGt/JU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775145730; c=relaxed/simple; bh=RynrkmsPjBrTKAylfOdaBo5j7TR9XNO11d/bf45huAI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=Nmr1edPCtrcFeinrA3JLq/QOuvQ6mwSqgXnXv6F6iOPUpG31WxV8Z6hM8jjBry2FdJFZun5sdLwqZAOpwmCh37wzlsZjnUxZj+jopJRL/DKHM8g5YP9uEqbXt1hz0nnBpj5+t0BaSbbn5OFEb7iFTMjtay6UnanQPh/p5cq8rfg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=iE9GK/fn; arc=none smtp.client-ip=74.125.82.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iE9GK/fn" Received: by mail-dy1-f173.google.com with SMTP id 5a478bee46e88-2b6b0500e06so1565834eec.1 for ; Thu, 02 Apr 2026 09:02:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775145728; x=1775750528; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VErXaAocdlc5UgqhS/sNUrt7vWuZgzHMcDW3jehfG04=; b=iE9GK/fnyNItTaCDNKiQpRPgDKN37dpBO4uaNpsZ1gGQn53SvUDJTPysGmXq773Vvl oEHMqiH5k1+a6buVzzKEV4pQAORlyHOt9rSwf768Rs0FkFG4k8wlgiZuhnxaDnW9xTXV AX3SWrwnH73gAk1mU+3WxQtbLOg/hEZy+DEMDMewfBHKOhFKE0jmtu5JazuxUIFMDUKX PQHDx7dBA8EgvZbPU+0X/upvIJTC/9xqz+yPTQW2bcTw6luoQU9+/r5K0egCPjufVxcA PkgyRQWjnPlI+1m3VNHxFDgqHQ4ULpmSxEEx9p8BbDPSfhHUyBZKfzErQlYQu2mJeljk iPGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775145728; x=1775750528; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=VErXaAocdlc5UgqhS/sNUrt7vWuZgzHMcDW3jehfG04=; b=HJ6TQf+k0aZuM6xEITvV6WSUez4SCDqJY33VeBUVwh/wq2wvWxYwC5dKCBRLK59UoK F6NcEr2B8F5FeDr+MYfekf5tk40si/aWLjJlGDMbJ/qn3mJRKtnBsu2Xh2KRyQyt5nzK 291pPSXPHRtQQtptxhoiOX7gCiABJzn9Eijl/fPxbya8F0Lvow7fzuXUiPrzhXC0Lm6k UmIlyHxwRwTxyF4uPhtGYdv+lRw9DJPcz5sk8OdmPczy834ciG1Ubk3gOVrHY7y7KziH FGj/bd5rhippRKhMwiPqKmjpDnyf8VNbo9dWWhhuo6eHiqojV/P6HidT7Qt+ZK85Vc3D QLQQ== X-Forwarded-Encrypted: i=1; AJvYcCUVoVSpXqo8ZiB65j9MagUR4fCilAwx5Ygsdi4EjRvc01hDQY/TXLX2QFV7WBLTdzoA2EDNE3ZSwp/WHJE=@vger.kernel.org X-Gm-Message-State: AOJu0YykRP+92WwLxZ9EroIIMh/AxIgNdpXH0aENb43Ide4M0IFT6WG/ MLJG3TsMGb00+hYI4CpLdLOEv8sf/Xf5fZyhJdwTy2CnL0/4faqODj63 X-Gm-Gg: AeBDietkExG15VJp1YZJfvAa9vrb99YYyMRoq5pEDwdf8ncf37Bi1MojqnQ2//ylcHU DxI0ASRheJyyM2bSwkYI7T/T3v5KIZrFqHu4pcFTfA1oXuk2Advj3GGZ/xW0rnLk/EpQGJ0Qgzl g5VUU8obf2tZ6lizPsleFkV3rqGo2IrDr/p5i8ltU0kSHqPoL2AKoPDtbGC5Z6No/Di0JID/6RG pTAnZCqz4vF5Hz34VjN2ZuhAtns5DHb+VSoq+fBxE1afe6O3aCey/7rUdtNRvh8zBfCsnKscBJ0 VK4/vC7CrM5VewI4Yh+l/FdMCWrlkQ3p/onSE6EBOc1IVBMqlS2fr6cXpON2xh0ijL0CsE05ABs ZYKfqKCehc/zlsF+p++dh8zTZx+ZA8ppM/2sfo/7kFGAmg7GyWiBH9x+zPVgfalPRIQT4FHlm0C IxQ/0Yctn2Sqj1SOvvUO5rAD0eEOIVMlOgCqi1vvBdAHdFEUZbIFUZGXVbXg5iChilSYI4DmWZy Tv+B9StBkFeefpG6sqx6SsmTMxcVLKD2B8tlNUFb1pnZ+nzbt3mt7bd2gOfdBvsv6Y= X-Received: by 2002:a05:7300:fd8b:b0:2c0:f15a:ecbc with SMTP id 5a478bee46e88-2ca8fd69069mr1912965eec.33.1775145727172; Thu, 02 Apr 2026 09:02:07 -0700 (PDT) Received: from localhost.localdomain (108-214-96-168.lightspeed.sntcca.sbcglobal.net. [108.214.96.168]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2ca78df3c11sm2835293eec.4.2026.04.02.09.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 09:02:06 -0700 (PDT) From: Sun Jian To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, eddyz87@gmail.com, song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@fomichev.me, haoluo@google.com, jolsa@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, horms@kernel.org, shuah@kernel.org Cc: syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, Sun Jian Subject: [PATCH bpf-next v3] bpf: reject short IPv4/IPv6 inputs in bpf_prog_test_run_skb Date: Fri, 3 Apr 2026 00:01:47 +0800 Message-ID: <20260402160147.215499-1-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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) to initialize sk fields. 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. Also extend empty_skb selftests with ETH_HLEN-sized packets carrying IPv4/IPv6 EtherType but no L3 header. Reported-by: syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=619b9ef527f510a57cfc Signed-off-by: Sun Jian --- Changes in v3: - Rework the fix by moving the checks into the existing protocol switch in bpf_prog_test_run_skb() instead of duplicating the switch. - Add empty_skb selftests for ETH_HLEN-sized packets with IPv4/IPv6 EtherType but no L3 header. - Retarget to bpf-next. Link: https://lore.kernel.org/bpf/20260329161751.1914272-1-sun.jian.kdev@gmail.com/ net/bpf/test_run.c | 20 ++++++++----- .../selftests/bpf/prog_tests/empty_skb.c | 29 +++++++++++++++++++ 2 files changed, 41 insertions(+), 8 deletions(-) diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 178c4738e63b..300e2bfc5a62 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c @@ -1120,19 +1120,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: diff --git a/tools/testing/selftests/bpf/prog_tests/empty_skb.c b/tools/testing/selftests/bpf/prog_tests/empty_skb.c index 438583e1f2d1..d53567e9cd77 100644 --- a/tools/testing/selftests/bpf/prog_tests/empty_skb.c +++ b/tools/testing/selftests/bpf/prog_tests/empty_skb.c @@ -12,6 +12,8 @@ void test_empty_skb(void) struct bpf_program *prog; char eth_hlen_pp[15]; char eth_hlen[14]; + char ipv4_eth_hlen[14]; + char ipv6_eth_hlen[14]; int veth_ifindex; int ipip_ifindex; int err; @@ -46,6 +48,24 @@ void test_empty_skb(void) .err = -EINVAL, }, + /* ETH_HLEN-sized packets with IPv4/IPv6 EtherType but + * no L3 header are rejected. + */ + { + .msg = "veth short IPv4 ingress packet", + .data_in = ipv4_eth_hlen, + .data_size_in = sizeof(ipv4_eth_hlen), + .ifindex = &veth_ifindex, + .err = -EINVAL, + }, + { + .msg = "veth short IPv6 ingress packet", + .data_in = ipv6_eth_hlen, + .data_size_in = sizeof(ipv6_eth_hlen), + .ifindex = &veth_ifindex, + .err = -EINVAL, + }, + /* ETH_HLEN-sized packets: * - can not be redirected at LWT_XMIT * - can be redirected at TC to non-tunneling dest @@ -108,6 +128,15 @@ void test_empty_skb(void) SYS(out, "ip addr add 192.168.1.1/16 dev ipip0"); ipip_ifindex = if_nametoindex("ipip0"); + memset(ipv4_eth_hlen, 0, sizeof(ipv4_eth_hlen)); + memset(ipv6_eth_hlen, 0, sizeof(ipv6_eth_hlen)); + + ipv4_eth_hlen[12] = 0x08; + ipv4_eth_hlen[13] = 0x00; + + ipv6_eth_hlen[12] = 0x86; + ipv6_eth_hlen[13] = 0xdd; + bpf_obj = empty_skb__open_and_load(); if (!ASSERT_OK_PTR(bpf_obj, "open skeleton")) goto out; -- 2.43.0