2012-10-23 12:21:34 +00:00
|
|
|
--- a/net/netlink/af_netlink.c
|
|
|
|
+++ b/net/netlink/af_netlink.c
|
2012-10-24 13:05:22 +00:00
|
|
|
@@ -880,25 +880,7 @@ void netlink_detachskb(struct sock *sk,
|
2012-10-23 12:21:34 +00:00
|
|
|
|
|
|
|
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
|
|
|
|
{
|
|
|
|
- int delta;
|
|
|
|
-
|
|
|
|
skb_orphan(skb);
|
|
|
|
-
|
|
|
|
- delta = skb->end - skb->tail;
|
|
|
|
- if (delta * 2 < skb->truesize)
|
|
|
|
- return skb;
|
|
|
|
-
|
|
|
|
- if (skb_shared(skb)) {
|
|
|
|
- struct sk_buff *nskb = skb_clone(skb, allocation);
|
|
|
|
- if (!nskb)
|
|
|
|
- return skb;
|
|
|
|
- consume_skb(skb);
|
|
|
|
- skb = nskb;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (!pskb_expand_head(skb, 0, -delta, allocation))
|
|
|
|
- skb->truesize -= delta;
|
|
|
|
-
|
|
|
|
return skb;
|
|
|
|
}
|
|
|
|
|