Re: [PATCH net v4 1/3] net/sched: sch_teql: unshare the header before writing and fix retry strip

From
Jamal Hadi Salim <jhs@mojatatu.com>
Date
2026-11-15 23:26:58
Also in
stable
Reply to
netdev-bot+sashiko@kernel.org, 2026-11-15
On Sun, Nov 15, 2026 at 10:47 AM [off-list ref] wrote:
Thank you for your contribution! Sashiko AI review found 1 potential
issue(s) to consider.

Critical: 0 · High: 0 · Medium: 1 · Low: 0

If you believe none of the issues are legitimate, please reply to each
issue of Medium severity or higher and explain why the AI is wrong.
If any of them are legitimate and you plan to respin, please let patchwork
know by including "pw-bot: cr" as a separate line at the end of your reply
(one such reply per series is enough).

- [Medium] The fix leaves a gap: `skb_cow_head()` in `__teql_resolve()`
  (net/sched/sch_teql.c) only runs when `neigh_event_send(n, skb_res) ==…
I think this one deserves a respin. Will send a v5 in the morning.

pw-bot: cr

cheers,
jamal
--

net/sched: sch_teql: unshare the header before writing and fix retry strip

This patch calls skb_cow_head() in __teql_resolve() before
dev_hard_header() writes the slave's link header, so that a header-cloned
skb does not corrupt the other clone. It also records how many header bytes
each slave added in teql_master_xmit() and pulls back only that many on
retry. As a result, an AF_PACKET frame with no dst keeps its user-supplied
header.

Link: https://lore.kernel.org/netdev/20260824115928.4099988-1-victor@mojatatu.com/ (local)
Link: https://lore.kernel.org/netdev/20261110101908.2e64e8e9@kernel.org/ (local)
quoted
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index dc21cd9704a25..3f781a3ffb41a 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
[ ... ]
quoted
@@ -293,15 +293,24 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res,
      }

      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);
+             /* Unshare the header before dev_hard_header() writes to it. */
+             if (skb_cow_head(skb, LL_RESERVED_SPACE(dev)) < 0) {
+                     err = -ENOMEM;
+                     goto out;
+             }
              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;
      }
[Severity: Medium]
The skb_cow_head() only runs when neigh_event_send() returns 0. What
happens to a header-cloned skb that takes the else branch instead?

Suppose every slave neighbour is unresolved on the first pass of
teql_master_xmit(). Then neigh_event_send(n, NULL) fails, teql_resolve()
returns -EAGAIN and nores is set, and no unshare has run. teql then
restarts with the same skb as skb_res:

teql_master_xmit() {
    ...
        if (nores && skb_res == NULL) {
                skb_res = skb;
                rcu_read_unlock();
                goto restart;
        }
    ...
}

On the restart, neigh_event_send(n, skb_res) parks the skb on the slave
neighbour's arp_queue with its header still cloned:

net/core/neighbour.c:__neigh_event_send() {
    ...
                        skb_dst_force(skb);
                        __skb_queue_tail(&neigh->arp_queue, skb);
    ...
}

The usual reinjection path is covered. The skb's dst resolves to teql0's
own neighbour, whose output is neigh_direct_output(). That re-enters
teql_master_xmit(), where the new skb_cow_head() runs.

However, neigh_update_process_arp_queue() can fall back to a different
neighbour:

net/core/neighbour.c:neigh_update_process_arp_queue() {
    ...
                n2 = NULL;
                if (dst &&
                    READ_ONCE(dst->obsolete) != DST_OBSOLETE_DEAD) {
                        n2 = dst_neigh_lookup_skb(dst, skb);
                        if (n2)
                                n1 = n2;
                }
                READ_ONCE(n1->output)(n1, skb);
    ...
}

This happens in two cases:

- The dst became DST_OBSOLETE_DEAD while the skb was parked (for example,
  a route delete that ends in dst_dev_put()), or dst_neigh_lookup_skb()
  fails. Then n1 stays the slave's neighbour.

- In the tc-mirred setup from the commit message, the dst belongs to the
  physical device, so n1 is that device's neighbour.

In both cases neigh_resolve_output() writes the link header without
checking skb_header_cloned():

net/core/neighbour.c:neigh_resolve_output() {
    ...
                        __skb_pull(skb, skb_network_offset(skb));
                        seq = read_seqbegin(&neigh->ha_lock);
                        err = dev_hard_header(skb, dev, ntohs(skb->protocol),
                                              neigh->ha, NULL, skb->len);
    ...
}

Can this overwrite the link header of the other clone, such as the mirred
original still pending on the physical device or a PF_PACKET tap clone? In
the mirred case the bytes written are usually identical, but they differ if
the lladdr changed in the meantime.

The commit message says "a header-cloned skb is unshared before the write",
but the arp_queue handoff does not seem to be covered.

The later patches in the series don't add an unshare on this path either:

- "net: neighbour: reinject a parked skb through a headerless output
  device" only rewrites skb->dev for a headerless n1.

- "net/sched: sch_teql: keep skb->dev consistent on the arp-queue path"
  only moves the skb->dev = slave assignment.

Would it work to call skb_cow_head() before neigh_event_send(n, skb_res),
or once at the top of teql_master_xmit()?
quoted
+out:
      neigh_release(n);
      return err;
 }
[ ... ]

--
Sashiko AI review · https://netdev-ai.bots.linux.dev/sashiko/#/patchset/QDISC-6HS9.v4.r0.20261111094338%40mojatatu.com
Thread (7 messages) 7 messages, 2 authors, last reply 5h ago
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help