From owner-svn-src-user@FreeBSD.ORG  Wed Aug 24 18:44:05 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ED370106566C;
	Wed, 24 Aug 2011 18:44:05 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id DCB3A8FC08;
	Wed, 24 Aug 2011 18:44:05 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p7OIi55Q066212;
	Wed, 24 Aug 2011 18:44:05 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p7OIi5fX066210;
	Wed, 24 Aug 2011 18:44:05 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201108241844.p7OIi5fX066210@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 24 Aug 2011 18:44:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225149 - user/hrs/ipv6/usr.sbin/rtadvd
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 24 Aug 2011 18:44:06 -0000

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 |