svn commit: r225149 - user/hrs/ipv6/usr.sbin/rtadvd

[Hiroki Sato]

Author: hrs
Date: Wed Aug 24 18:44:05 2011
New Revision: 225149
URL: http://svn.freebsd.org/changeset/base/225149

Log:
  Fix SIGSEGV when receiving RAs that contain RDNSS and/or DNSSL options.
  
  Spotted by:	ps

Modified:
  user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c

Modified: user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c
==============================================================================
--- user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Wed Aug 24 18:41:48 2011	(r225148)
+++ user/hrs/ipv6/usr.sbin/rtadvd/rtadvd.c	Wed Aug 24 18:44:05 2011	(r225149)
@@ -910,6 +910,7 @@ rs_input(int len, struct nd_router_solic
 
 	/* ND option check */
 	memset(&ndopts, 0, sizeof(ndopts));
+	TAILQ_INIT(&ndopts.opt_list);
 	if (nd6_options((struct nd_opt_hdr *)(rs + 1),
 			len - sizeof(struct nd_router_solicit),
 			&ndopts, NDOPT_FLAG_SRCLINKADDR)) {
@@ -1083,6 +1084,7 @@ ra_input(int len, struct nd_router_adver
 
 	/* ND option check */
 	memset(&ndopts, 0, sizeof(ndopts));
+	TAILQ_INIT(&ndopts.opt_list);
 	error = nd6_options((struct nd_opt_hdr *)(nra + 1),
 	    len - sizeof(struct nd_router_advert), &ndopts,
 	    NDOPT_FLAG_SRCLINKADDR | NDOPT_FLAG_PREFIXINFO | NDOPT_FLAG_MTU |