This is a followup of commit dc4b95b8fee9 ("net/sched: sch_teql: restore skb->dev on the slave failure path") as reported by Sashiko. The issue: teql_master_xmit() writes the slave's link header into the skb in teql_resolve() and on retry pulls it back with __skb_pull(). Two bugs: 1. When the skb's header is cloned (e.g. a tc-mirred action on a physical device's clsact egress redirects to the teql master), the write corrupts the other clone. Call skb_cow_head() first. 2. The pull always removes skb_network_offset() bytes. For an AF_PACKET/SOCK_RAW frame with no dst entry, teql_resolve() adds no header, so the retry strips the user-supplied one. Pull back only the length this slave added. The Fix: Unshare the header before the neighbour is asked to send the skb, so the skb is private whether the neighbour writes the link header at once or parks it on its arp_queue and writes it when the entry resolves. Track the added length per iteration; an AF_PACKET frame retries with its header intact. Conditions to recreate the bug: CONFIG_NET_SCH_TEQL=y and CONFIG_VETH=y, run as root. A teql master with two veth slaves, the first slave returning NETDEV_TX_BUSY without consuming the skb so that teql retries the frame on the second one: ip link add vethBAD type veth peer name vethBADp ip link add vethGOOD type veth peer name vethGOODp ip link set vethBAD up; ip link set vethBADp up ip link set vethGOOD up; ip link set vethGOODp up tc qdisc add dev vethBAD root teql0 tc qdisc add dev vethGOOD root teql0 ip link set teql0 up Send a SOCK_RAW frame that carries its own link header on teql0 and capture it on the second slave's peer. A veth transmit does not return NETDEV_TX_BUSY on its own; to hold the skb pending this reproduction used a test-only IFF_DEBUG accelerator in veth_xmit(), which is not part of this patch and was applied to both the unfixed and the fixed build. On the unfixed tree the captured frame arrives with its header stripped (176 of the 208 bytes sent, starting at the payload) because the retry pulls skb_network_offset() bytes while this slave added none. With the patch the frame arrives intact. The shared headroom case needs a second reference to the skb to survive the transmit. A PF_PACKET tap on the master whose socket is never drained keeps one alive; a kprobe on eth_header then reports cloned=1 without the patch and cloned=0 with it. The parked path needs the unshare before the queue: a tc-mirred mirror on a physical device's clsact egress parks the clone on the teql slave's unresolved neighbour, so hold the original frame in a netem delay on that device and then resolve the slave's neighbour through a changed lladdr. Without the unshare the arp-queue drain writes the new link header over the original frame's first bytes, and a listener on the peer sees a frame addressed to the new lladdr instead of to itself; with the patch the queued frame keeps its own destination address. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Sashiko (gemini) Closes: https://sashiko.dev/#/patchset/20260824115928.4099988-1-victor@mojatatu.com Reported-by: Sashiko (nipa) Link: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/QDISC-6HS9.v4.r0.20261111094338-1%40mojatatu.com Link: https://lore.kernel.org/netdev/20260824115928.4099988-1-victor@mojatatu.com/ Link: https://lore.kernel.org/netdev/20261110101908.2e64e8e9@kernel.org/ Cc: stable@vger.kernel.org Reviewed-by: Victor Nogueira Reviewed-by: Simon Horman Signed-off-by: Jamal Hadi Salim --- v4 -> v5: - unshare the skb header before the neighbour is asked to send it, not only on the path where the neighbour writes the link header at once. A skb parked on the slave's arp_queue is drained through neigh_update_process_arp_queue(), which writes the header itself, so the unshare has to happen before neigh_event_send(). - the shared-headroom paragraph of "Conditions to recreate the bug" now describes that parked path. net/sched/sch_teql.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index dc21cd9704a2..626dc001ec23 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -262,7 +262,7 @@ static int teql_qdisc_init(struct Qdisc *sch, struct nlattr *opt, static int __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *dev, struct netdev_queue *txq, - struct dst_entry *dst) + struct dst_entry *dst, int *hlen) { struct neighbour *n; int err = 0; @@ -292,16 +292,26 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, n = mn; } + /* Unshare the head before the neighbour can write or queue it. */ + if (skb_cow_head(skb, LL_RESERVED_SPACE(dev)) < 0) { + err = -ENOMEM; + goto out; + } + if (neigh_event_send(n, skb_res) == 0) { + int off = skb_network_offset(skb); char haddr[MAX_ADDR_LEN]; neigh_ha_snapshot(haddr, n, dev); if (dev_hard_header(skb, dev, ntohs(skb_protocol(skb, false)), haddr, NULL, skb->len) < 0) err = -EINVAL; + /* The bytes prepended above skb->data, pulled back on retry. */ + *hlen = skb_network_offset(skb) - off; } else { err = (skb_res == NULL) ? -EAGAIN : 1; } +out: neigh_release(n); return err; } @@ -309,11 +319,13 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, static inline int teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, struct net_device *dev, - struct netdev_queue *txq) + struct netdev_queue *txq, + int *hlen) { struct dst_entry *dst = skb_dst(skb); int res; + *hlen = 0; if (rcu_access_pointer(txq->qdisc) == &noop_qdisc) return -ENODEV; @@ -321,7 +333,7 @@ static inline int teql_resolve(struct sk_buff *skb, return 0; rcu_read_lock(); - res = __teql_resolve(skb, skb_res, dev, txq, dst); + res = __teql_resolve(skb, skb_res, dev, txq, dst, hlen); rcu_read_unlock(); return res; @@ -335,6 +347,7 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) struct Qdisc *start, *q; unsigned long flags; int nores; + int hlen; int busy; restart: @@ -361,7 +374,7 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) continue; } - switch (teql_resolve(skb, skb_res, slave, slave_txq)) { + switch (teql_resolve(skb, skb_res, slave, slave_txq, &hlen)) { case 0: if (__netif_tx_trylock(slave_txq)) { unsigned int length = qdisc_pkt_len(skb); @@ -408,8 +421,10 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) nores = 1; break; } + /* Pull back only the header this slave added. */ + if (hlen > 0) + __skb_pull(skb, hlen); skb->dev = dev; - __skb_pull(skb, skb_network_offset(skb)); } while ((q = rcu_dereference(NEXT_SLAVE(q))) != start); if (nores && skb_res == NULL) { -- 2.43.0 The issue: neigh_update_process_arp_queue() drains a neighbour's arp_queue and reinjects every skb through READ_ONCE(n1->output)(n1, skb), where n1 is the top-level neighbour re-looked-up from the skb's dst, not the neighbour the skb was queued on. skb->dev is whatever the producer left there. Note: skb->dev and n1->dev are not guaranteed to be equal. When n1->dev has no header_ops, arp_constructor() and ndisc_constructor() install neigh_direct_output(), a plain dev_queue_xmit() that transmits on skb->dev and builds no link header. Such an output sends the skb out whatever device skb->dev names, not out n1->dev, so a producer that parked the skb naming a lower device has it leave without the link header its own transmit path builds. sch_teql is the producer that hits this: it parks the skb on the slave's neighbour while the top-level neighbour is the master's, so skb->dev and n1->dev differ and the reinjection has to come back through the master to leave with a header. It names the slave on purpose, so that a parked skb does not outlive the master it came from. This half was split out of the sch_teql fix on review, so that the neighbour restore carries its own commit log and its own Cc set. The Fix: Put skb->dev back to n1->dev before the output call when that device builds no link header, so a headerless output transmits on the device the neighbour belongs to, whatever the producer left in skb->dev. A forward that steers the skb to another device, nft fwd ... neigh or bpf_redirect_neigh() with explicit nexthop parameters, parks it with the dst of the original route still attached. When the original route is itself a headerless device this gate matches there and the skb goes back out the original device, running its egress hook a second time. Those forwards supply their own device and nexthop and do not consult the retained dst, so dropping it at those two sites is where that is fixed; that is a separate change to the producers. Conditions to recreate the bug: CONFIG_NET_SCH_TEQL=m and CONFIG_VETH=y, run as root. This is the neighbour half of the sch_teql parked-skb fix, reached once sch_teql parks the skb naming the slave: create a veth pair, make one end a teql slave, give the master an address and a route, flush the slave's neighbour entry and send one packet: ip link add v0 type veth peer name v0p ip link set v0 up; ip link set v0p up tc qdisc add dev v0 root teql0 ip link set teql0 up ip addr add 10.0.0.1/24 dev teql0 ip route add 10.0.0.99/32 dev teql0 ip neigh flush dev v0 ping -I teql0 -c 1 10.0.0.99 The packet parks on v0's arp_queue. When the solicitation resolves, neigh_update_process_arp_queue() reinjects it; without this change it leaves v0 directly, with no link header, and never reaches the peer. The window that frees the master, and the unload recipe that shows it, are in the sch_teql patch. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Link: https://lore.kernel.org/netdev/20261110101908.2e64e8e9@kernel.org/ Cc: stable@vger.kernel.org Signed-off-by: Jamal Hadi Salim --- net/core/neighbour.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index d6e9c7c59a89..1b556fa17c57 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -1339,6 +1339,9 @@ static void neigh_update_process_arp_queue(struct neighbour *neigh) if (n2) n1 = n2; } + /* headerless output transmits on skb->dev, not n1->dev */ + if (!n1->dev->header_ops) + skb->dev = n1->dev; READ_ONCE(n1->output)(n1, skb); if (n2) neigh_release(n2); -- 2.34.1 This is a follow-up to commit dc4b95b8fee9 ("net/sched: sch_teql: restore skb->dev on the slave failure path") by Victor Nogueira, which covered the slave side of the same mismatch. The issue: teql_master_xmit() sets skb->dev = slave only right before the slave's ndo_start_xmit(). If the slave's neighbour is unresolved, teql_resolve() parks the skb on the slave's arp_queue with skb->dev still naming the teql master. teql_exit() frees the masters on module unload and a slave can outlive them, so a queued skb can be reinjected through freed memory. The Fix: Set skb->dev = slave before teql_resolve() so the parked skb names the device whose neighbour owns it. The parked skb has a second consumer: when the neighbour fails instead of resolving, neigh_invalidate() hands it to error_report() and dst_link_failure(), which read skb->dev to report the failure, so it names the slave on that path too. A parked skb is reinjected by neigh_update_process_arp_queue(), and a device that transmits straight on skb->dev has to be handed its skb back there. That is a change to net/core/neighbour.c, posted as its own fix, and it has to be applied before this one: without it the parked packet leaves the slave directly, with no link header, because teql_master_xmit() has already pulled it. Some context: Only a module unload frees a master. teql_master_setup() installs no rtnl_link_ops and default_device_exit_net() moves the device to init_net when its namespace exits, so the window is a parked skb plus CAP_SYS_MODULE on an unloaded sch_teql. Conditions to recreate the bug: CONFIG_NET_SCH_TEQL=m and CONFIG_VETH=y, run as root. Create a veth pair, make one end a teql slave, give the master an address and a route, flush the slave's neighbour entry and send one packet: ip link add v0 type veth peer name v0p ip link set v0 up; ip link set v0p up tc qdisc add dev v0 root teql0 ip link set teql0 up ip addr add 10.0.0.1/24 dev teql0 ip route add 10.0.0.99/32 dev teql0 ip neigh flush dev v0 ping -I teql0 -c 1 10.0.0.99 & sleep 1 The skb waits on v0's arp_queue while the solicitation is in flight. Remove the qdisc, which drops the module reference it holds, and unload the module while the skb still waits: tc qdisc del dev v0 root rmmod sch_teql teql_exit() frees teql0 there. When the solicitation then fails, neigh_invalidate() drains the queue through arp_error_report() and ipv4_link_failure(), whose __icmp_send() reads skb_in->dev; that is the freed master before this patch and v0 after it. A resolved neighbour drains the same queue through neigh_update_process_arp_queue(). On the unfixed tree the skb is parked on v0's arp_queue while skb->dev still names teql0, so the reinjection can reach a master that teql_exit() has freed. The park and the headerless delivery reproduce without the unload. Freeing the master while the skb waits needs sch_teql built as a module, as above. An unfixed kernel reports this when the timer drains that queue: ================================================================== BUG: KASAN: slab-use-after-free in __icmp_send+0x3f9/0x1680 Read of size 4 at addr ffff8880039bc0b0 by task swapper/3/0 CPU: 3 UID: 0 PID: 0 Comm: swapper/3 Call Trace: ... __icmp_send+0x3f9/0x1680 ipv4_link_failure+0x3a0/0x5b0 arp_error_report+0x5b/0xc0 neigh_invalidate+0x125/0x240 neigh_timer_handler+0x47d/0x750 call_timer_fn+0x138/0x410 ... Allocated by task 307: alloc_netdev_mqs+0x81/0x930 ... Freed by task 335: netdev_release+0x45/0x60 device_release+0x7d/0x120 kobject_put+0xf3/0x2e0 put_device+0x13/0x30 free_netdev+0x3b3/0x4a0 ... Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Reported-by: Sashiko (nipa) Closes: https://netdev-ai.bots.linux.dev/sashiko/#/patchset/20260824115928.4099988-1-victor@mojatatu.com Link: https://lore.kernel.org/netdev/20260824115928.4099988-1-victor@mojatatu.com/ Link: https://lore.kernel.org/netdev/20261026160747.283702-1-horms@kernel.org/ Link: https://lore.kernel.org/netdev/20261031165925.780930-1-horms@kernel.org/ Link: https://lore.kernel.org/netdev/179363700308.3131.11778179538290251434@kernel.org/ Link: https://lore.kernel.org/netdev/20261110101908.2e64e8e9@kernel.org/ Cc: stable@vger.kernel.org Reviewed-by: Victor Nogueira Reviewed-by: Simon Horman Signed-off-by: Jamal Hadi Salim --- net/sched/sch_teql.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 626dc001ec23..e60d8f3b127d 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -374,13 +374,13 @@ static netdev_tx_t teql_master_xmit(struct sk_buff *skb, struct net_device *dev) continue; } + skb->dev = slave; switch (teql_resolve(skb, skb_res, slave, slave_txq, &hlen)) { case 0: if (__netif_tx_trylock(slave_txq)) { unsigned int length = qdisc_pkt_len(skb); int rc = NETDEV_TX_BUSY; - skb->dev = slave; if (!netif_xmit_frozen_or_stopped(slave_txq)) rc = netdev_start_xmit(skb, slave, slave_txq, false); __netif_tx_unlock(slave_txq); -- 2.34.1