From owner-svn-src-head@freebsd.org  Mon Jul 20 08:21:52 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4F37B9A6C9D;
 Mon, 20 Jul 2015 08:21:52 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3A4A31A38;
 Mon, 20 Jul 2015 08:21:52 +0000 (UTC) (envelope-from zec@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6K8LqSJ046140;
 Mon, 20 Jul 2015 08:21:52 GMT (envelope-from zec@FreeBSD.org)
Received: (from zec@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6K8LqZK046132;
 Mon, 20 Jul 2015 08:21:52 GMT (envelope-from zec@FreeBSD.org)
Message-Id: <201507200821.t6K8LqZK046132@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: zec set sender to zec@FreeBSD.org
 using -f
From: Marko Zec <zec@FreeBSD.org>
Date: Mon, 20 Jul 2015 08:21:52 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r285713 - head/sys/net
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
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/options/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: Mon, 20 Jul 2015 08:21:52 -0000

Author: zec
Date: Mon Jul 20 08:21:51 2015
New Revision: 285713
URL: https://svnweb.freebsd.org/changeset/base/285713

Log:
  Prevent null-pointer dereferencing.
  
  MFC after:	3 days

Modified:
  head/sys/net/if.c

Modified: head/sys/net/if.c
==============================================================================
--- head/sys/net/if.c	Mon Jul 20 07:26:31 2015	(r285712)
+++ head/sys/net/if.c	Mon Jul 20 08:21:51 2015	(r285713)
@@ -335,11 +335,12 @@ ifnet_setbyindex(u_short idx, struct ifn
 struct ifaddr *
 ifaddr_byindex(u_short idx)
 {
-	struct ifaddr *ifa;
+	struct ifnet *ifp;
+	struct ifaddr *ifa = NULL;
 
 	IFNET_RLOCK_NOSLEEP();
-	ifa = ifnet_byindex_locked(idx)->if_addr;
-	if (ifa != NULL)
+	ifp = ifnet_byindex_locked(idx);
+	if (ifp != NULL && (ifa = ifp->if_addr) != NULL)
 		ifa_ref(ifa);
 	IFNET_RUNLOCK_NOSLEEP();
 	return (ifa);