From owner-svn-src-user@FreeBSD.ORG  Wed Dec 10 03:16:31 2008
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 2783E1065670;
	Wed, 10 Dec 2008 03:16:31 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 137DA8FC1B;
	Wed, 10 Dec 2008 03:16:31 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mBA3GUO2011860;
	Wed, 10 Dec 2008 03:16:30 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mBA3GU0p011859;
	Wed, 10 Dec 2008 03:16:30 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200812100316.mBA3GU0p011859@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Wed, 10 Dec 2008 03:16:30 +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: r185828 - user/kmacy/head_arpv2/sys/netinet6
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, 10 Dec 2008 03:16:31 -0000

Author: kmacy
Date: Wed Dec 10 03:16:30 2008
New Revision: 185828
URL: http://svn.freebsd.org/changeset/base/185828

Log:
  rt might be null do not dereference blindly

Modified:
  user/kmacy/head_arpv2/sys/netinet6/nd6.c

Modified: user/kmacy/head_arpv2/sys/netinet6/nd6.c
==============================================================================
--- user/kmacy/head_arpv2/sys/netinet6/nd6.c	Wed Dec 10 03:04:16 2008	(r185827)
+++ user/kmacy/head_arpv2/sys/netinet6/nd6.c	Wed Dec 10 03:16:30 2008	(r185828)
@@ -1110,11 +1110,12 @@ nd6_nud_hint(struct rtentry *rt, struct 
 {
 	INIT_VNET_INET6(curvnet);
 	struct llentry *ln;
-	struct ifnet *ifp = rt->rt_ifp;
+	struct ifnet *ifp;
 
-	if (dst6 == NULL)
+	if ((dst6 == NULL) || (rt == NULL))
 		return;
 
+	ifp = rt->rt_ifp;
 	IF_AFDATA_LOCK(ifp);
 	ln = nd6_lookup(dst6, ND6_EXCLUSIVE, NULL);
 	IF_AFDATA_UNLOCK(ifp);