BPF List
 help / color / mirror / Atom feed
From: "Alexei Starovoitov" <alexei.starovoitov@gmail.com>
To: "Eric Dumazet" <edumazet@kernel.org>,
	"David S . Miller" <davem@davemloft.net>,
	"Jakub Kicinski" <kuba@kernel.org>,
	"Paolo Abeni" <pabeni@redhat.com>
Cc: "Willem de Bruijn" <willemb@google.com>,
	"Simon Horman" <horms@kernel.org>, <netdev@vger.kernel.org>,
	<bpf@vger.kernel.org>, "Andrew Lunn" <andrew+netdev@lunn.ch>,
	"Aaron Conole" <aconole@redhat.com>,
	"Eelco Chaudron" <echaudro@redhat.com>,
	"Ilya Maximets" <i.maximets@ovn.org>,
	"Jamal Hadi Salim" <jhs@mojatatu.com>,
	"Jiri Pirko" <jiri@resnulli.us>, <dev@openvswitch.org>,
	"Willem de Bruijn" <willemdebruijn.kernel@gmail.com>,
	"Ren Wei" <weir@nebusec.ai>
Subject: Re: [PATCH net v2 0/5] net: fix eth_type_trans() crashes on skbs coming from the stack
Date: Wed, 28 Oct 2026 17:34:44 +0000	[thread overview]
Message-ID: <DMGNHWT5M153.3C6CZBKTPNBAY@gmail.com> (raw)
In-Reply-To: <20261028122703.2093730-1-edumazet@kernel.org>

On Wed, Oct 28, 2026 at 05:26 AM Eric Dumazet <edumazet@kernel.org> wrote:
> Other eth_type_trans() users already pull the header or never see
> such skbs:

netkit_xmit() has the same problem, I think.
It calls eth_skb_pull_mac() directly, not eth_type_trans().
It pulls ETH_HLEN before netkit_run(). The prog can shrink the linear
part after that:

  AF_PACKET SOCK_RAW on nk0          eth (ETH_P_IP) / eth / 8192 bytes
  tc egress on nk0
    vlan pop_eth                     skb_headlen() == 0
                                     skb_mac_header_len() == 0
  netkit_xmit()
    pskb_may_pull(skb, ETH_HLEN)     skb_headlen() == 14
    netkit_run()
      bpf_skb_adjust_room(skb, -1, BPF_ADJ_ROOM_MAC, 0)
        bpf_skb_generic_pop()        off == 0, skb_headlen() == 13
    eth_skb_pull_mac()               BUG() in __skb_pull()

It's an old bug and it doesn't block this series.
It can be a follow up.

Something like this (compile tested only):

diff --git a/drivers/net/netkit.c b/drivers/net/netkit.c
index 82e608e..f093103 100644
--- a/drivers/net/netkit.c
+++ b/drivers/net/netkit.c
@@ -116,6 +116,9 @@ static netdev_tx_t netkit_xmit(struct sk_buff *skb, struct net_device *dev)
 	switch (ret) {
 	case NETKIT_NEXT:
 	case NETKIT_PASS:
+		/* The prog may have shrunk the linear part */
+		if (unlikely(!pskb_may_pull(skb, ETH_HLEN)))
+			goto drop;
 		eth_skb_pull_mac(skb);
 		skb_postpull_rcsum(skb, eth_hdr(skb), ETH_HLEN);
 		if (likely(__netif_rx(skb) == NET_RX_SUCCESS)) {

For the series:
Acked-by: Alexei Starovoitov <ast@kernel.org>

  parent reply	other threads:[~2026-10-28 17:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-10-28 12:26 [PATCH net v2 0/5] net: fix eth_type_trans() crashes on skbs coming from the stack Eric Dumazet
2026-10-28 12:26 ` [PATCH net v2 1/5] net: add eth_type_trans_careful() Eric Dumazet
2026-10-28 12:27 ` [PATCH net v2 2/5] loopback: use eth_type_trans_careful() Eric Dumazet
2026-10-28 18:48   ` Willem de Bruijn
2026-10-28 12:27 ` [PATCH net v2 3/5] net: use eth_type_trans_careful() in __dev_forward_skb2() Eric Dumazet
2026-10-28 19:03   ` Willem de Bruijn
2026-10-28 12:27 ` [PATCH net v2 4/5] openvswitch: use eth_type_trans_careful() in internal_dev_recv() Eric Dumazet
2026-10-28 19:04   ` Willem de Bruijn
2026-10-28 12:27 ` [PATCH net v2 5/5] net/sched: act_ife: do not consume the inner header on egress Eric Dumazet
2026-10-28 17:34 ` Alexei Starovoitov [this message]
2026-10-28 19:31   ` [PATCH net v2 0/5] net: fix eth_type_trans() crashes on skbs coming from the stack Daniel Borkmann

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=DMGNHWT5M153.3C6CZBKTPNBAY@gmail.com \
    --to=alexei.starovoitov@gmail.com \
    --cc=aconole@redhat.com \
    --cc=andrew+netdev@lunn.ch \
    --cc=bpf@vger.kernel.org \
    --cc=davem@davemloft.net \
    --cc=dev@openvswitch.org \
    --cc=echaudro@redhat.com \
    --cc=edumazet@kernel.org \
    --cc=horms@kernel.org \
    --cc=i.maximets@ovn.org \
    --cc=jhs@mojatatu.com \
    --cc=jiri@resnulli.us \
    --cc=kuba@kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=pabeni@redhat.com \
    --cc=weir@nebusec.ai \
    --cc=willemb@google.com \
    --cc=willemdebruijn.kernel@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox