]> Pileus Git - ~andy/linux/commitdiff
net: add a temporary sanity check in skb_orphan()
authorEric Dumazet <edumazet@google.com>
Thu, 1 Aug 2013 18:43:08 +0000 (11:43 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 1 Aug 2013 19:49:28 +0000 (12:49 -0700)
David suggested to add a BUG_ON() to catch if some layer
sets skb->sk pointer without a corresponding destructor.

As skb can sit in a queue, it's mandatory to make sure the
socket cannot disappear, and it's usually done by taking a
reference on the socket, then releasing it from the skb
destructor.

This patch is a follow-up to commit c34a761231b5
("net: skb_orphan() changes") and will be reverted after
catching all possible offenders if any.

Suggested-by: David Miller <davem@davemloft.net>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
include/linux/skbuff.h

index a95547adff257475014848bc7f61e26b4adeef43..d48de687c21fdf2b68da78d30db661a67d8c6e46 100644 (file)
@@ -1809,6 +1809,8 @@ static inline void skb_orphan(struct sk_buff *skb)
                skb->destructor(skb);
                skb->destructor = NULL;
                skb->sk         = NULL;
+       } else {
+               BUG_ON(skb->sk);
        }
 }