diff --git a/[refs] b/[refs] index 803343a82781..4637e1ae2776 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12a169e7d8f4b1c95252d8b04ed0f1033ed7cfe2 +refs/heads/master: 4edd87ad5cad8e159e0db3ce3131b3d97219c9cd diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c index 2c218a0808b4..8bd248a64879 100644 --- a/trunk/net/core/skbuff.c +++ b/trunk/net/core/skbuff.c @@ -738,6 +738,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, #endif long off; + BUG_ON(nhead < 0); + if (skb_shared(skb)) BUG();