From nobody Mon Jun 15 03:52:25 2026 Received: from mail-yx1-f52.google.com (mail-yx1-f52.google.com [74.125.224.52]) (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 A8E1416132A for ; Wed, 8 Apr 2026 03:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620019; cv=none; b=VlpXuSAu4pCC1WI40OD7iGMNTgLFpurTyhFBx6qxQzNCaaw0E4i4LHA6R/AFKvDWC4ER/7YK1tBUJgNJQNM0NTiS9mngEJFl+9MA8xH3k8b3bXU5je9j3iR+ODxzim0/dADhm9/13Di7bF/8KPKmZei2XeAwMnPFnnkj4BOUtc4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620019; c=relaxed/simple; bh=XLWK3U7t3wtnUiVeSeL403GD/3ggJvFV0dCHkY3YMwo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fjx8YGw12r/VAmo/uiEFrLGVd8ijBgp/tOwfeJLs4LECJYviAx+PNLnu8qCQ6tdO5oDnBh2TsbsFPgq9T8W3+x2llSJ9rMzw1/zXjzsSfTbpMaulpvwM2M4cnLKlAEYXe0VX7ntp6dX3av+Zklgrs+Jsn5nShud0eSjqUdHpnvo= 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=IlImg9ZM; arc=none smtp.client-ip=74.125.224.52 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="IlImg9ZM" Received: by mail-yx1-f52.google.com with SMTP id 956f58d0204a3-64f48a5c3d8so5996077d50.1 for ; Tue, 07 Apr 2026 20:46:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775620018; x=1776224818; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=gEYNDhDMiU1B6pQ6eoniUd0oA2vBhdScWVGs5ZrFJmE=; b=IlImg9ZMzcIHtEWX/wo0mYRM8uDU2XMJZ8EDGrXzzqUqv3WoAN8SidnFqMpOEkCFPO kbCPOpGTHN1EvpKxB6WtgcS15Uikw4alIYqtGwAMU0IqJom2qEfRL29aoYCKvtCKsx+c blBvxHyB0DWnyEVmFtdBu7dmIAtp3zi6q7uLwoD29B1DJ/WCN94o8n6jV4qWCCRhmnf6 2+7SotRmxzvVwbfPlAbj6jHO7zTRKD3KWjLYNp8IecZaOOMFORgJxZwPgFgzqyKt6XL2 uFGm4HlLruAIxX1hQfdfOKjpG2AUwI6r6iA7a3UDlQauUU+ZS+2YSrc23uO9ZKpo10nz 1n/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775620018; x=1776224818; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=gEYNDhDMiU1B6pQ6eoniUd0oA2vBhdScWVGs5ZrFJmE=; b=LXdoQ5RwfI/Q8aNb0VesC5Mm64KMI5H06YOHhm0prkHhUkFBBUoyajAsx8cjL7sjDe 3N/gBuRCtuwsyQrTEodUmutRlKp1UaGHkt3peGq1hg4cAPTNzIAPMHbp2lmDbt9EoyDa UzP0buPsxT07PJz6/bSc3ralLohIHkXeEcu9xQ/WImsriqAjkn86nplq8QxS8UbJzGSi LXLwBEp6ku46eZ3+6MQcni9BGN3tUbZo6SdhWvl4apVOncBMxbp32r5Y07DP190wuLrF Y5IV73cg2wi51dXOzMMmNp+xsjhjhRKeQNm4u5NqnwSED7kN5MKohEVEozaaGj2ZA6cj SGGg== X-Forwarded-Encrypted: i=1; AJvYcCX19jKnDnXUMYbDkduHdYsiego7i25TdZEWxaHfC527KNAzxENv31zWuP7SLZjiVEHE0k4Qpdxc5rTByBA=@vger.kernel.org X-Gm-Message-State: AOJu0YyZnr4bzVt5bRfaJclFnYSqoUh2zSyGL1ejln5b1HyibgZvvuRi 70no3VCjH6gpx+ErAWReZEn9MBvJRuFGz0loHSvsbvHEK326YVa+bqcz X-Gm-Gg: AeBDiesG7pc9oMb5+DnfG+Ohwp3PhYSBHlwRXm03qeJKn/YG9xtX4RWIlvcHAp5FKLt hnj+p+LPfU7SPhjxJkzpdAcr58aR182hWlt2N4oqk3+qFeI/WVrOCAVy+bYNzLN8AJPFriKBhWa Mvem4p4YNMANhP5uEtCA5InxRPcuw6uWbeg3XZHzyjQxpd+SWCVvbPPpA2gTkftWyklAV/6FsWZ 34PxDBqTdvl5PprqHpzOtzEJYHaOTdWdoCkWa6GvMc3JIPxTOzckzRx/ovAYQdZMbtnth6Ry/62 8KIk7xAh1raL4lQFusgf/V2gvSYnF2seMNFIaexnelJ8B4CVvm3ZUgsYApcp8gaOINCkx+tjev6 2Xo0fSMjuUIg6zo1Q5e+BYcEG+T5uogF/tAzoCUjSYAYMw0opFiHNRwaWIq11L1/swPObqZXVaO wMNK8rY7f/z/trQ6hDSU9u0nXJr3luTwJTh9KcfT8SV6igsefbf8UrkiIO8bxeKz32yhGsqsAIk ZT3j3kUPrUjIKpp5Qqp1uwFJth5qb0AKkse4QRkwbkb8nSkcvUN3D9efdxwoktHGJ8= X-Received: by 2002:a05:690c:3482:b0:7ac:ff2:4603 with SMTP id 00721157ae682-7ac0ff272d5mr6996747b3.20.1775620017727; Tue, 07 Apr 2026 20:46:57 -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 00721157ae682-7a370df155csm79129167b3.36.2026.04.07.20.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 20:46:57 -0700 (PDT) From: Sun Jian To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, shuah@kernel.org Cc: 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, horms@kernel.org, syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH bpf v4 1/2] bpf: reject short IPv4/IPv6 inputs in bpf_prog_test_run_skb Date: Wed, 8 Apr 2026 11:46:22 +0800 Message-ID: <20260408034623.180320-2-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260408034623.180320-1-sun.jian.kdev@gmail.com> References: <20260408034623.180320-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" 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_te= st_run_skb") Reported-by: syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3D619b9ef527f510a57cfc Signed-off-by: Sun Jian --- 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 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, co= nst union bpf_attr *kattr, =20 switch (skb->protocol) { case htons(ETH_P_IP): - sk->sk_family =3D AF_INET; - if (sizeof(struct iphdr) <=3D skb_headlen(skb)) { - sk->sk_rcv_saddr =3D ip_hdr(skb)->saddr; - sk->sk_daddr =3D ip_hdr(skb)->daddr; + if (skb_headlen(skb) < sizeof(struct iphdr)) { + ret =3D -EINVAL; + goto out; } + sk->sk_family =3D AF_INET; + sk->sk_rcv_saddr =3D ip_hdr(skb)->saddr; + sk->sk_daddr =3D ip_hdr(skb)->daddr; break; #if IS_ENABLED(CONFIG_IPV6) case htons(ETH_P_IPV6): - sk->sk_family =3D AF_INET6; - if (sizeof(struct ipv6hdr) <=3D skb_headlen(skb)) { - sk->sk_v6_rcv_saddr =3D ipv6_hdr(skb)->saddr; - sk->sk_v6_daddr =3D ipv6_hdr(skb)->daddr; + if (skb_headlen(skb) < sizeof(struct ipv6hdr)) { + ret =3D -EINVAL; + goto out; } + sk->sk_family =3D AF_INET6; + sk->sk_v6_rcv_saddr =3D ipv6_hdr(skb)->saddr; + sk->sk_v6_daddr =3D ipv6_hdr(skb)->daddr; break; #endif default: --=20 2.43.0 From nobody Mon Jun 15 03:52:25 2026 Received: from mail-yw1-f178.google.com (mail-yw1-f178.google.com [209.85.128.178]) (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 2605A2222AC for ; Wed, 8 Apr 2026 03:47:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620027; cv=none; b=OithsSyQhQ9LqrZGG+X7PUqaQT77vZL9T2+YZMFLkKU4LDTTwkJS8KSzNXY+ssW/ho3zAagsW6onsE3JK6BAPOe9JL9pIKADo+sKqNZ3D9jZAVsGgf7HhVhF25GzqbO6R5sicfgpf/nL+UBwQpIo+mEU3b75QCKfzMEL/GeQcCE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775620027; c=relaxed/simple; bh=qcV42KYEemU5riSTjc6YXQrEjjsTBdVPiuqNE8v7kl0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YN00oFLESn7FKsC+7VFjkoBzFmbBC8UETv7BSWqHoLbzc6r19mLyZZ08bVClQNbEWP7vPvriBy3/3QoujwkC+lGhqGwLAfpAf8CFFEOjH6rV6BfD6c90FcaOLekGpvUBPD2SnIUzP+a9eElZzEvmMkpzrAQAFYR5hkbud3TxJwk= 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=SpkFwlzz; arc=none smtp.client-ip=209.85.128.178 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="SpkFwlzz" Received: by mail-yw1-f178.google.com with SMTP id 00721157ae682-79a535e7c00so62208577b3.3 for ; Tue, 07 Apr 2026 20:47:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775620025; x=1776224825; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZDq9GzdF3GTXYAI+d4YHY/mPxeR+u0QCqSkXrW51+Yo=; b=SpkFwlzzQmYfscXIlDaIiVVkmkLrKaVlbQWodbevxZP2Hu0Tfgwg8ogiCeu5ka9VuY EIH9XcEGTBOuB61dQkWHDx1rIYVUq0r+wgctui6HCoyvGR9m1AsoWxtcUqQ+BgGZRi3W qA7VTsqOtSN2mhn0HD/ugwCF/vsVignSTwvZuQDgpuges/iYF7y2qeAfr+aVuANo1DfQ l1+5AucCrldeS9Jq1XCmPcpDuM80jMYXrHBVc15pTYuS6M6CE3WRUzTp8XaAG18XgsIF 6OZGJlImYj4Ku6bv3JcKfogVgNj8c1oFsSDzTFUaIblMbtY0HNmS8jSIapuOrQ7Czxj/ dk7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775620025; x=1776224825; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ZDq9GzdF3GTXYAI+d4YHY/mPxeR+u0QCqSkXrW51+Yo=; b=ZiIAIqJ83iiwvkg2KINAgtKTiXug3xQ+2rOaE8qtQLa/uUcQxynnw8z3U2ZfyO8a7k fQuwevyeaqIZw4uv6RqWzL8OhwZzbk4KuXv0i9siJKzAEil7X/LQLZ3wqM/q+00lcR3i 4krqPaJWXVF20saPvhT51cwPiT47NXIN8OLbWCLm29WyA9Xy8iLwNvMzOuOpYEw7lkSS qER2P51+qB/6WyhWAORY/Q8kzCEZ0xObvf/eqx4qKh5z0dWm6ThtPH+HewhoroCXPNtj rJSB7PvZ+fHtf4ik5cTv6Z571TvPDQ5VKgimmG3AMtGx2uFainKDojJ9+RemrqBAic2B Ig8A== X-Forwarded-Encrypted: i=1; AJvYcCWUHg39aShrcj/KETEdc8rJIR9Aut+mnOZJH/aQIW6gep+2/cRc2cM+xlRrXB7VgNLqWUkXMLre9hSa0TE=@vger.kernel.org X-Gm-Message-State: AOJu0Yw05369Axbyo8nWYMTNZGV5l9ZL1zSMPyhG8FInqmzJ/e6L1iJH ywD1PZR8NUB+ydkID7KL+gxT3ehAdy3mV8m2c4sw4plVgU5Enkw4MgCB X-Gm-Gg: AeBDievCWxlD3G84mZihamiD5+PvrQsHlM6btv1l8vHyvngv0+3eGL/B9thdZ++R8bb L7vVnR0dQy+5v/v7/1uvZLG5Qj518T+pUTDN7ahKi9rdW5VqByY1Gi28kjEwWHsZksYJu6RwNLS s5s6KvqnvMEtz1MvccWvdIaYwyZzhRaW5CtzrpP3dzVPtDae7NN8DiWbhVnbktBR+EM18ar96Cl dqpWlsb8UEqkb/3CDfQaue9D4x3h0dv5j6wd5hUjuaPmAKb4yCxdDr2xM2FSl2lcoL0x/9PV6aj luNgoGBGBLfxc4H0sIzGwoR9MvjlExSCGUHakalKRvSoxejJkT2LIL9wVBJyXZ+NjY2+wDZBmd8 ZIFDMv+dp05a/M2tvBBG35WXWTctINuk5t4c1LDNmFyyhaiKH7fTDTkK1yuu9E/r/HKOBDMARBE hMc0lCSckENF6hmOcbEREzrWhOH6s5Ark7Kp6MWF7ptw73atJdGC/gJNRT/soUFXFYYZ/SGdguH Asc1BW5ZA7HeM0K23CqegG0PSiqXHZ93/birE4Y1lIHyJuUrm0OZIQunGcpN4+FXNUuWp70CatH DQ== X-Received: by 2002:a05:690c:dc9:b0:79e:9cc1:ede7 with SMTP id 00721157ae682-7a4d62545a3mr195592387b3.10.1775620025220; Tue, 07 Apr 2026 20:47:05 -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 00721157ae682-7a370df155csm79129167b3.36.2026.04.07.20.46.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Apr 2026 20:47:04 -0700 (PDT) From: Sun Jian To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, shuah@kernel.org Cc: 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, horms@kernel.org, syzbot+619b9ef527f510a57cfc@syzkaller.appspotmail.com, bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Sun Jian Subject: [PATCH bpf v4 2/2] selftests/bpf: cover short IPv4/IPv6 inputs with adjust_room Date: Wed, 8 Apr 2026 11:46:23 +0800 Message-ID: <20260408034623.180320-3-sun.jian.kdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260408034623.180320-1-sun.jian.kdev@gmail.com> References: <20260408034623.180320-1-sun.jian.kdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add a selftest covering ETH_HLEN-sized IPv4/IPv6 EtherType inputs for bpf_prog_test_run_skb(). Reuse a single zero-initialized struct ethhdr eth_hlen and set eth_hlen.h_proto from the per-test h_proto field. Also add a dedicated tc_adjust_room program and route the short IPv4/IPv6 cases to it, so the selftest actually exercises the bpf_skb_adjust_room() path from the report. Signed-off-by: Sun Jian --- .../selftests/bpf/prog_tests/empty_skb.c | 40 +++++++++++++++++-- tools/testing/selftests/bpf/progs/empty_skb.c | 7 ++++ 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/tools/testing/selftests/bpf/prog_tests/empty_skb.c b/tools/tes= ting/selftests/bpf/prog_tests/empty_skb.c index 438583e1f2d1..c9fcb70cbafb 100644 --- a/tools/testing/selftests/bpf/prog_tests/empty_skb.c +++ b/tools/testing/selftests/bpf/prog_tests/empty_skb.c @@ -10,8 +10,8 @@ void test_empty_skb(void) struct empty_skb *bpf_obj =3D NULL; struct nstoken *tok =3D NULL; struct bpf_program *prog; + struct ethhdr eth_hlen; char eth_hlen_pp[15]; - char eth_hlen[14]; int veth_ifindex; int ipip_ifindex; int err; @@ -25,7 +25,9 @@ void test_empty_skb(void) int err; int ret; int lwt_egress_ret; /* expected retval at lwt/egress */ + __be16 h_proto; bool success_on_tc; + bool adjust_room; } tests[] =3D { /* Empty packets are always rejected. */ =20 @@ -46,6 +48,28 @@ void test_empty_skb(void) .err =3D -EINVAL, }, =20 + /* ETH_HLEN-sized packets with IPv4/IPv6 EtherType but + * no L3 header are rejected. + */ + { + .msg =3D "veth short IPv4 ingress packet", + .data_in =3D ð_hlen, + .data_size_in =3D sizeof(eth_hlen), + .ifindex =3D &veth_ifindex, + .err =3D -EINVAL, + .h_proto =3D htons(ETH_P_IP), + .adjust_room =3D true, + }, + { + .msg =3D "veth short IPv6 ingress packet", + .data_in =3D ð_hlen, + .data_size_in =3D sizeof(eth_hlen), + .ifindex =3D &veth_ifindex, + .err =3D -EINVAL, + .h_proto =3D htons(ETH_P_IPV6), + .adjust_room =3D true, + }, + /* ETH_HLEN-sized packets: * - can not be redirected at LWT_XMIT * - can be redirected at TC to non-tunneling dest @@ -54,7 +78,7 @@ void test_empty_skb(void) { /* __bpf_redirect_common */ .msg =3D "veth ETH_HLEN packet ingress", - .data_in =3D eth_hlen, + .data_in =3D ð_hlen, .data_size_in =3D sizeof(eth_hlen), .ifindex =3D &veth_ifindex, .ret =3D -ERANGE, @@ -68,7 +92,7 @@ void test_empty_skb(void) * tc: skb->len=3D14 <=3D skb_network_offset=3D14 */ .msg =3D "ipip ETH_HLEN packet ingress", - .data_in =3D eth_hlen, + .data_in =3D ð_hlen, .data_size_in =3D sizeof(eth_hlen), .ifindex =3D &ipip_ifindex, .ret =3D -ERANGE, @@ -108,17 +132,27 @@ void test_empty_skb(void) SYS(out, "ip addr add 192.168.1.1/16 dev ipip0"); ipip_ifindex =3D if_nametoindex("ipip0"); =20 + memset(eth_hlen_pp, 0, sizeof(eth_hlen_pp)); + memset(ð_hlen, 0, sizeof(eth_hlen)); + bpf_obj =3D empty_skb__open_and_load(); if (!ASSERT_OK_PTR(bpf_obj, "open skeleton")) goto out; =20 for (i =3D 0; i < ARRAY_SIZE(tests); i++) { + if (tests[i].data_in =3D=3D ð_hlen) + eth_hlen.h_proto =3D tests[i].h_proto; + bpf_object__for_each_program(prog, bpf_obj->obj) { bool at_egress =3D strstr(bpf_program__name(prog), "egress") !=3D NULL; bool at_tc =3D !strncmp(bpf_program__section_name(prog), "tc", 2); + bool is_adjust_room =3D !strcmp(bpf_program__name(prog), "tc_adjust_roo= m"); int expected_ret; char buf[128]; =20 + if (tests[i].adjust_room !=3D is_adjust_room) + continue; + expected_ret =3D at_egress && !at_tc ? tests[i].lwt_egress_ret : tests[= i].ret; =20 tattr.data_in =3D tests[i].data_in; diff --git a/tools/testing/selftests/bpf/progs/empty_skb.c b/tools/testing/= selftests/bpf/progs/empty_skb.c index 4b0cd6753251..44326f5cc8bb 100644 --- a/tools/testing/selftests/bpf/progs/empty_skb.c +++ b/tools/testing/selftests/bpf/progs/empty_skb.c @@ -35,3 +35,10 @@ int tc_redirect_egress(struct __sk_buff *skb) ret =3D bpf_clone_redirect(skb, ifindex, 0); return 0; } + +SEC("tc") +int tc_adjust_room(struct __sk_buff *skb) +{ + ret =3D bpf_skb_adjust_room(skb, 4, BPF_ADJ_ROOM_NET, 0); + return 0; +} --=20 2.43.0