From 294d1951bb396b6098528d35a1a5efa45d7c491f Mon Sep 17 00:00:00 2001 From: Patrick McHardy Date: Wed, 17 Apr 2013 06:46:59 +0000 Subject: [PATCH] --- yaml --- r: 369318 b: refs/heads/master c: 1298ca4671acb10310baa550ed044c553e3a3387 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/netlink/af_netlink.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 13e5724a4003..d263735f4175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0ebd0ac5ff01ebf412e1bd3c33620ef7ffc5d866 +refs/heads/master: 1298ca4671acb10310baa550ed044c553e3a3387 diff --git a/trunk/net/netlink/af_netlink.c b/trunk/net/netlink/af_netlink.c index 978a61f7c87f..26779c24b1d4 100644 --- a/trunk/net/netlink/af_netlink.c +++ b/trunk/net/netlink/af_netlink.c @@ -851,7 +851,7 @@ static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { int delta; - skb_orphan(skb); + WARN_ON(skb->sk != NULL); delta = skb->end - skb->tail; if (delta * 2 < skb->truesize)