Use skb_irq_freeable to warn on all cases where it is not safe to free a skb in hard irq context. Signed-off-by: "Eric W. Biederman" <ebiederm@xxxxxxxxxxxx> --- net/core/skbuff.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 3f14c638c2b1..aaee52840a7d 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -554,14 +554,14 @@ static void kfree_skbmem(struct sk_buff *skb) static void skb_release_head_state(struct sk_buff *skb) { + WARN_ON(in_irq() && !skb_irq_freeable(skb)); + skb_dst_drop(skb); #ifdef CONFIG_XFRM secpath_put(skb->sp); #endif - if (skb->destructor) { - WARN_ON(in_irq()); + if (skb->destructor) skb->destructor(skb); - } #if IS_ENABLED(CONFIG_NF_CONNTRACK) nf_conntrack_put(skb->nfct); #endif -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html