From owner-svn-src-head@FreeBSD.ORG  Tue Jun  7 12:00:29 2011
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CCFD710656F3;
	Tue,  7 Jun 2011 12:00:29 +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 BDC128FC93;
	Tue,  7 Jun 2011 12:00:29 +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 p57C0TTC082813;
	Tue, 7 Jun 2011 12:00:29 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p57C0TLR082811;
	Tue, 7 Jun 2011 12:00:29 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201106071200.p57C0TLR082811@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Tue, 7 Jun 2011 12:00:29 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r222820 - head/usr.sbin/rtadvd
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 07 Jun 2011 12:00:29 -0000

Author: hrs
Date: Tue Jun  7 12:00:29 2011
New Revision: 222820
URL: http://svn.freebsd.org/changeset/base/222820

Log:
  - Use ELM_MALLOC() for struct rainfo.
  
  - Fix a missing back pointer assignment in struct prefix to struct rainfo
    when addr="" is specified.  This caused SIGSEGV.
  
  - Insert a prefix element to a tail queue after setting parameters.

Modified:
  head/usr.sbin/rtadvd/config.c

Modified: head/usr.sbin/rtadvd/config.c
==============================================================================
--- head/usr.sbin/rtadvd/config.c	Tue Jun  7 11:11:11 2011	(r222819)
+++ head/usr.sbin/rtadvd/config.c	Tue Jun  7 12:00:29 2011	(r222820)
@@ -229,13 +229,7 @@ getconfig(int idx)
 		     __func__, intface);
 	}
 
-	rai = malloc(sizeof(*rai));
-	if (rai == NULL) {
-		syslog(LOG_INFO, "<%s> %s: can't allocate enough memory",
-		    __func__, intface);
-		exit(1);
-	}
-	memset(rai, 0, sizeof(*rai));
+	ELM_MALLOC(rai, exit(1));
 	TAILQ_INIT(&rai->rai_prefix);
 #ifdef ROUTEINFO
 	TAILQ_INIT(&rai->rai_route);
@@ -394,10 +388,7 @@ getconfig(int idx)
 
 		/* allocate memory to store prefix information */
 		ELM_MALLOC(pfx, exit(1));
-
-		/* link into chain */
-		TAILQ_INSERT_TAIL(&rai->rai_prefix, pfx, pfx_next);
-		rai->rai_pfxs++;
+		pfx->pfx_rainfo = rai;
 		pfx->pfx_origin = PREFIX_FROM_CONFIG;
 
 		if (inet_pton(AF_INET6, addr, &pfx->pfx_prefix) != 1) {
@@ -481,6 +472,9 @@ getconfig(int idx)
 			pfx->pfx_pltimeexpire =
 			    now.tv_sec + pfx->pfx_preflifetime;
 		}
+		/* link into chain */
+		TAILQ_INSERT_TAIL(&rai->rai_prefix, pfx, pfx_next);
+		rai->rai_pfxs++;
 	}
 	if (rai->rai_advifprefix && rai->rai_pfxs == 0)
 		get_prefix(rai);