58b66cdd75
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.18 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46299
31 lines
664 B
Diff
31 lines
664 B
Diff
--- a/net/netlink/af_netlink.c
|
|
+++ b/net/netlink/af_netlink.c
|
|
@@ -1690,27 +1690,7 @@ void netlink_detachskb(struct sock *sk,
|
|
|
|
static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation)
|
|
{
|
|
- int delta;
|
|
-
|
|
WARN_ON(skb->sk != NULL);
|
|
- if (netlink_skb_is_mmaped(skb))
|
|
- return skb;
|
|
-
|
|
- delta = skb->end - skb->tail;
|
|
- if (is_vmalloc_addr(skb->head) || 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;
|
|
}
|
|
|