summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorYOSHIFUJI Hideaki / 吉藤英明2013-01-18 03:05:03 +0100
committerDavid S. Miller2013-01-18 20:41:13 +0100
commit115b0aa6b444e8dd89b7f67b77b8c472763fbc1a (patch)
treed242f8dcb91fcaceb14011874c5d6a5f74f7e0de /net
parentipv6: Remove unused neigh argument for icmp6_dst_alloc() and its callers. (diff)
downloadkernel-qcow2-linux-115b0aa6b444e8dd89b7f67b77b8c472763fbc1a.tar.gz
kernel-qcow2-linux-115b0aa6b444e8dd89b7f67b77b8c472763fbc1a.tar.xz
kernel-qcow2-linux-115b0aa6b444e8dd89b7f67b77b8c472763fbc1a.zip
ndisc: Check NS message length before access.
Check message length before accessing "target" field, as we do for other types. Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ndisc.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c
index 429622d74705..350f86005c13 100644
--- a/net/ipv6/ndisc.c
+++ b/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;