From bc1f453d7a3f057c7456330ad0e01ebcea63483c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?YOSHIFUJI=20Hideaki=20/=20=E5=90=89=E8=97=A4=E8=8B=B1?= =?UTF-8?q?=E6=98=8E?= Date: Mon, 21 Jan 2013 06:48:03 +0000 Subject: [PATCH] --- yaml --- r: 351509 b: refs/heads/master c: 6bce6b4e16e46cc860175b9e10a283194ef9f004 h: refs/heads/master i: 351507: 51b293e35571e8ecda0330a7696463bd86990961 v: v3 --- [refs] | 2 +- trunk/net/ipv6/ndisc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb23d2758a33..cc7361278980 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c558e9fca876d6d0463a7c337d2291774b9c6f96 +refs/heads/master: 6bce6b4e16e46cc860175b9e10a283194ef9f004 diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c index 82ccf0a43063..539b2ec37d3a 100644 --- a/trunk/net/ipv6/ndisc.c +++ b/trunk/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);