Merge branch 'vlan-ensure-sufficient-headroom-in-vlan_dev_hard_header'

Browse source

Eric Dumazet says:

====================
vlan: ensure sufficient headroom in vlan_dev_hard_header()

Callers that only reserve ETH_HLEN or less, or skbs allocated before
dynamic device/headroom changes (such as toggling VLAN_FLAG_REORDER_HDR
or bonding/team switching slaves), can reach vlan_dev_hard_header() with
insufficient headroom and trigger skb_under_panic().

When vlan_dev_hard_header() returns -ENOMEM upon skb_cow_head() failure,
a few callers of dev_hard_header() / llc_mac_hdr_init() had pre-existing
error-handling bugs:
====================

Link: https://patch.msgid.link/20260924082951.1599377-1-edumazet@google.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

...

This commit is contained in:

Jakub Kicinski 2026-09-24 11:01:03 -07:00

parent 72b5b9a28b cd5dd68267

commit 1078a38344

5 changed files with 16 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

net/8021q/vlan_dev.c

View file

5

net/bridge/br_stp_bpdu.c

View file

2

net/llc/llc_c_ac.c

View file

4

net/llc/llc_s_ac.c

View file

7

net/sched/sch_teql.c

View file