From: YOSHIFUJI Hideaki / 吉藤英明 <yoshfuji@linux-ipv6.org>
Date: Mon, 21 Jan 2013 06:48:03 +0000 (+0000)
Subject: ndisc: Use skb_linearize() instead of pskb_may_pull(skb, skb->len).
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=6bce6b4e16e46cc860175b9e10a283194ef9f004;p=deliverable%2Flinux.git

ndisc: Use skb_linearize() instead of pskb_may_pull(skb, skb->len).

Suggested by Eric Dumazet <edumazet@google.com>.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 82ccf0a43063..539b2ec37d3a 100644
--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -1509,7 +1509,7 @@ int ndisc_rcv(struct sk_buff *skb)
 {
 	struct nd_msg *msg;
 
-	if (!pskb_may_pull(skb, skb->len))
+	if (skb_linearize(skb))
 		return 0;
 
 	msg = (struct nd_msg *)skb_transport_header(skb);