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

yoshfuji · davem330 · commit 6bce6b4e16e4 · 2013-01-21T13:33:14.000-05:00
Suggested by Eric Dumazet &lt;edumazet@google.com&gt;.

Signed-off-by: YOSHIFUJI Hideaki &lt;yoshfuji@linux-ipv6.org&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git 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);

Original file line number	Diff line number	Diff line change
`@@ -1509,7 +1509,7 @@ int ndisc_rcv(struct sk_buff *skb)`
`1509`	`1509`	`{`
`1510`	`1510`	`struct nd_msg *msg;`
`1511`	`1511`
`1512`		`- if (!pskb_may_pull(skb, skb->len))`
	`1512`	`+ if (skb_linearize(skb))`
`1513`	`1513`	`return 0;`
`1514`	`1514`
`1515`	`1515`	`msg = (struct nd_msg *)skb_transport_header(skb);`