From 77c73a65082804a6c48c6ef97d75a68bc76c3f79 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?= <yoshfuji@linux-ipv6.org>
Date: Fri, 18 Jan 2013 02:05:03 +0000
Subject: [PATCH] --- yaml --- r: 351469 b: refs/heads/master c:
 115b0aa6b444e8dd89b7f67b77b8c472763fbc1a h: refs/heads/master i:   351467:
 4bead0aa21dff716b0384ae79e60f11cacb418ff v: v3

---
 [refs]                 | 2 +-
 trunk/net/ipv6/ndisc.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 89e04183737b..0cb9ad86c5fc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12fd84f4383b15b0a12cfd50b7c527cd55d6f101
+refs/heads/master: 115b0aa6b444e8dd89b7f67b77b8c472763fbc1a
diff --git a/trunk/net/ipv6/ndisc.c b/trunk/net/ipv6/ndisc.c
index 429622d74705..350f86005c13 100644
--- a/trunk/net/ipv6/ndisc.c
+++ b/trunk/net/ipv6/ndisc.c
@@ -671,6 +671,11 @@ static void ndisc_recv_ns(struct sk_buff *skb)
 	bool inc;
 	int is_router = -1;
 
+	if (skb->len < sizeof(struct nd_msg)) {
+		ND_PRINTK(2, warn, "NS: packet too short\n");
+		return;
+	}
+
 	if (ipv6_addr_is_multicast(&msg->target)) {
 		ND_PRINTK(2, warn, "NS: multicast target address\n");
 		return;