Skip to content

net: fix eth_type_trans() crashes on skbs coming from the stack

Eric Dumazet bpf netdev stable 2 versions – Applied

Status from this message: This series was applied to netdev/net.git (main)

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest5 patches 5 repliesApplied 5/5
  2. v15 patches 15 repliesSuperseded

Changes in v2 from the cover letter

- Patch 3: update the empty_skb BPF selftest. At lwt_xmit, its "veth ETH_HLEN+1" packet is a 1-byte skb, which is now dropped on veth ingress, as veth_xmit() already does on egress (BPF CI).
- Rebased on latest net, collected tags from Aaron, Willem and Jamal.
- No kernel code change.

Patches in v2 All 5 applied

#Subject and filesSizeRepliesApplied
1/5net: add eth_type_trans_careful()include/linux/etherdevice.h+28 -00 repliesApplied
2/5loopback: use eth_type_trans_careful()drivers/net/loopback.c+7 -11 replyApplied
3/5net: use eth_type_trans_careful() in __dev_forward_skb2()net/core/dev.c tools/testing/selftests/bpf/prog_tests/empty_skb.c+25 -121 replyApplied
4/5openvswitch: use eth_type_trans_careful() in internal_dev_recv()net/openvswitch/vport-internal_dev.c+7 -11 replyApplied
5/5net/sched: act_ife: do not consume the inner header on egressnet/sched/act_ife.c+4 -00 repliesApplied

Reviews trailers per patch

4 of 5 patches have a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchAaron ConoleWillem de BruijnJamal Hadi SalimAlexei Starovoitov
SeriesA-b
1/5R-b R-b R-b T-b
2/5R-b R-b T-b
3/5R-b R-b T-b
4/5R-b R-b R-b T-b
5/5

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 4 reviewers.

Read the v2 thread

Cover letter [PATCH net v2 0/5] net: fix eth_type_trans() crashes on skbs coming from the stack

eth_type_trans() assumes ETH_HLEN bytes are present in skb->head. NIC drivers always provide this, and they should keep using the fast version, without an extra pskb_may_pull().

Devices looping skbs from their transmit path back to their receive path get skbs built by the stack instead. tc actions (act_vlan pop_eth, act_ife decode), BPF helpers (bpf_skb_change_head() before a redirect) or OVS actions (pop_eth followed by pop_mpls/pop_nsh) can leave fewer than ETH_HLEN bytes in the linear part, and eth_type_trans() then hits the BUG() in __skb_pull().

Instead of fixing every producer, or adding a check to all eth_type_trans() users, fix the few consumers exposed to this:

- Patch 1 adds eth_type_trans_careful(), which pulls the Ethernet header first and returns a drop reason on failure.
- Patch 2 uses it in loopback_xmit().
- Patch 3 uses it in __dev_forward_skb2(), used by BPF redirects to ingress and by veth, macvlan, ipvlan, netdevsim and l2tp_eth.
- Patch 4 uses it in OVS internal_dev_recv(), covering both the MPLS (TEB) and NSH pop cases at once (only the MPLS case was tested).
- Patch 5 (from Jamal) fixes act_ife decode on egress, which was consuming the inner Ethernet header. This is no longer a crash after patch 2, but egress decode never delivered a correct frame.

Other eth_type_trans() users already pull the header or never see such skbs:
- vrf_process_v{4,6}_outbound() already pull ETH_HLEN + IP header before vrf_local_xmit().
- tun already uses pskb_may_pull_reason(skb, ETH_HLEN).
- XDP: bpf_xdp_adjust_head() and bpf_xdp_adjust_tail() keep at least ETH_HLEN bytes in the linear part, and multi-buffer tail shrinking only trims frags.

Tested under virtme-ng with AF_PACKET reproducers. Without the series, all four cases crash in eth_type_trans():
- lo egress "action vlan pop_eth", eth/eth/8192 bytes frame
- lo egress "action ife decode pipe", IFE frame with 8192 bytes payload
- lo egress "action vlan pop_eth continue", then a BPF program doing bpf_skb_change_head(skb, 1, 0) + bpf_redirect(veth1, BPF_F_INGRESS)
- OVS flow "pop_eth,pop_mpls(0x6558),0" to the internal port, eth/mpls/eth/4096 bytes frame
With the series, no crash. An ICMP echo inside an IFE frame decoded on lo egress is now received and answered. Normal traffic on lo, veth (including 8000 byte pings) and vrf is unchanged.

v2:
- Patch 3: update the empty_skb BPF selftest. At lwt_xmit, its "veth ETH_HLEN+1" packet is a 1-byte skb, which is now dropped on veth ingress, as veth_xmit() already does on egress (BPF CI).
- Rebased on latest net, collected tags from Aaron, Willem and Jamal.
- No kernel code change.

v1: https://lore.kernel.org/netdev/[email protected]/

Eric Dumazet (4):
net: add eth_type_trans_careful()
loopback: use eth_type_trans_careful()
net: use eth_type_trans_careful() in __dev_forward_skb2()
openvswitch: use eth_type_trans_careful() in internal_dev_recv()

Jamal Hadi Salim (1):
net/sched: act_ife: do not consume the inner header on egress

 drivers/net/loopback.c                        |  8 +++++-
 include/linux/etherdevice.h                   | 28 +++++++++++++++++++
 net/core/dev.c                                | 18 ++++++++----
 net/openvswitch/vport-internal_dev.c          |  8 +++++-
 net/sched/act_ife.c                           |  4 +++
 .../selftests/bpf/prog_tests/empty_skb.c      | 19 ++++++++-----
 6 files changed, 71 insertions(+), 14 deletions(-)
Signature · 1 line
2.53.0