neigh: let neigh_xmit take skb ownership
Subsystems (2)
PATCH 1/1 neigh: let neigh_xmit take skb ownership
neigh_xmit always releases the skb, except when no neighbour table is found. But even the first added user of neigh_xmit (mpls) relied on neigh_xmit to release the skb (or queue it for tx).
sashiko reported:
If neigh_xmit() is called with an uninitialized neighbor table (for example, NEIGH_ND_TABLE when IPv6 is disabled), it returns -EAFNOSUPPORT and bypasses its internal out_kfree_skb error path. Because the return value of neigh_xmit() is ignored here, does this leak the SKB?
Assume full ownership and remove the last code path that doesn't xmit or free skb.
---
could followup in -next to make it "void", existing callers either ignore retval or do:
if (err)
net_dbg_ratelimited("%s: ...
net/core/neighbour.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/core/neighbour.c +5 -5
@@ -3211,8 +3211,10 @@ int neigh_xmit(int index, struct net_device *dev,rcu_read_lock (); tbl =rcu_dereference (neigh_tables[index]); -if (!tbl) - goto out_unlock; +if (!tbl) { +rcu_read_unlock (); + goto out_kfree_skb; + }if (index ==NEIGH_ARP_TABLE ) {u32 key = *((u32 *)addr);
@@ -3228,7 +3230,6 @@ int neigh_xmit(int index, struct net_device *dev, goto out_kfree_skb; } err =READ_ONCE (neigh->output)(neigh, skb); -out_unlock:rcu_read_unlock (); }else if (index ==NEIGH_LINK_TABLE ) {
@@ -3238,11 +3239,10 @@ int neigh_xmit(int index, struct net_device *dev, goto out_kfree_skb; err =dev_queue_xmit (skb); } -out:return err; out_kfree_skb:kfree_skb (skb); - goto out; +return err; }EXPORT_SYMBOL (neigh_xmit);
Signature · 1 line
2.53.0
Quoted 11 lines · Florian Westphal
neigh_xmitalways releases the skb, except when no neighbour table is found. But even the first added user ofneigh_xmit(mpls) relied onneigh_xmitto release the skb (or queue it for tx).sashiko reported:
Ifneigh_xmit()is called with an uninitialized neighbor table (for example,NEIGH_ND_TABLEwhen IPv6 is disabled), it returns-EAFNOSUPPORTand bypasses its internalout_kfree_skberror path. Because the return value ofneigh_xmit()is ignored here, does this leak the SKB?
Quoted 7 lines
Assume full ownership and remove the last code path that doesn't xmit or free skb.
Fixes 4fd3d7d9e868 ("neigh: Add helper function neigh_xmit")Signed-off-by Florian Westphal <[email protected]>---
could followup in -next to make it "void",
Makes sense.
Quoted 10 lines · Florian Westphal
neigh_xmitalways releases the skb, except when no neighbour table is found. But even the first added user ofneigh_xmit(mpls) relied onneigh_xmitto release the skb (or queue it for tx).sashiko reported:
Ifneigh_xmit()is called with an uninitialized neighbor table (for example,NEIGH_ND_TABLEwhen IPv6 is disabled), it returns-EAFNOSUPPORTand bypasses its internalout_kfree_skberror path. Because the return value ofneigh_xmit()is ignored here, does this leak the SKB?
Quoted 5 lines
Assume full ownership and remove the last code path that doesn't xmit or free skb.
Fixes 4fd3d7d9e868 ("neigh: Add helper function neigh_xmit")Signed-off-by Florian Westphal <[email protected]>
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 11 lines · On Fri, 24 Apr 2026 16:58:38 +0200 you wrote:
neigh_xmitalways releases the skb, except when no neighbour table is found. But even the first added user ofneigh_xmit(mpls) relied onneigh_xmitto release the skb (or queue it for tx).sashiko reported:
Ifneigh_xmit()is called with an uninitialized neighbor table (for example,NEIGH_ND_TABLEwhen IPv6 is disabled), it returns-EAFNOSUPPORTand bypasses its internalout_kfree_skberror path. Because the return value ofneigh_xmit()is ignored here, does this leak the SKB?[...]
Here is the summary with links:
- [net] neigh: let neigh_xmit take skb ownership
https://git.kernel.org/netdev/net/c/4438113be604
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html