提交 3d861f66 编写于 作者: E Eric Dumazet 提交者: David S. Miller

net: fix secpath kmemleak

Mike Kazantsev found 3.5 kernels and beyond were leaking memory,
and tracked the faulty commit to a1c7fff7 ("net:
netdev_alloc_skb() use build_skb()")

While this commit seems fine, it uncovered a bug introduced
in commit bad43ca8 ("net: introduce skb_try_coalesce()), in function
kfree_skb_partial()"):

If head is stolen, we free the sk_buff,
without removing references on secpath (skb->sp).

So IPsec + IP defrag/reassembly (using skb coalescing), or
TCP coalescing could leak secpath objects.

Fix this bug by calling skb_release_head_state(skb) to properly
release all possible references to linked objects.
Reported-by: NMike Kazantsev <mk.fraggod@gmail.com>
Signed-off-by: NEric Dumazet <edumazet@google.com>
Bisected-by: NMike Kazantsev <mk.fraggod@gmail.com>
Tested-by: NMike Kazantsev <mk.fraggod@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 8a6e29d6
...@@ -3379,10 +3379,12 @@ EXPORT_SYMBOL(__skb_warn_lro_forwarding); ...@@ -3379,10 +3379,12 @@ EXPORT_SYMBOL(__skb_warn_lro_forwarding);
void kfree_skb_partial(struct sk_buff *skb, bool head_stolen) void kfree_skb_partial(struct sk_buff *skb, bool head_stolen)
{ {
if (head_stolen) if (head_stolen) {
skb_release_head_state(skb);
kmem_cache_free(skbuff_head_cache, skb); kmem_cache_free(skbuff_head_cache, skb);
else } else {
__kfree_skb(skb); __kfree_skb(skb);
}
} }
EXPORT_SYMBOL(kfree_skb_partial); EXPORT_SYMBOL(kfree_skb_partial);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册