Module Name: src
Committed By: joerg
Date: Thu Feb 20 13:36:06 UTC 2014
Modified Files:
src/sys/netinet6: icmp6.c
Log Message:
Bail out in case m_pulldown failed.
To generate a diff of this commit:
cvs rdiff -u -r1.163 -r1.164 src/sys/netinet6/icmp6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/icmp6.c
diff -u src/sys/netinet6/icmp6.c:1.163 src/sys/netinet6/icmp6.c:1.164
--- src/sys/netinet6/icmp6.c:1.163 Sat Nov 23 14:20:22 2013
+++ src/sys/netinet6/icmp6.c Thu Feb 20 13:36:06 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: icmp6.c,v 1.163 2013/11/23 14:20:22 christos Exp $ */
+/* $NetBSD: icmp6.c,v 1.164 2014/02/20 13:36:06 joerg Exp $ */
/* $KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.163 2013/11/23 14:20:22 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: icmp6.c,v 1.164 2014/02/20 13:36:06 joerg Exp $");
#include "opt_inet.h"
#include "opt_ipsec.h"
@@ -630,6 +630,8 @@ icmp6_input(struct mbuf **mp, int *offp,
}
IP6_EXTHDR_GET(nicmp6, struct icmp6_hdr *, n, off,
sizeof(*nicmp6));
+ if (nicmp6 == NULL)
+ goto freeit;
nicmp6->icmp6_type = ICMP6_ECHO_REPLY;
nicmp6->icmp6_code = 0;
if (n) {