From owner-svn-src-all@FreeBSD.ORG  Fri May 31 04:46:00 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 1B4B662E;
 Fri, 31 May 2013 04:46:00 +0000 (UTC)
 (envelope-from gibbs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0D025F1B;
 Fri, 31 May 2013 04:46:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4V4jx8H018879;
 Fri, 31 May 2013 04:45:59 GMT (envelope-from gibbs@svn.freebsd.org)
Received: (from gibbs@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4V4jx7N018878;
 Fri, 31 May 2013 04:45:59 GMT (envelope-from gibbs@svn.freebsd.org)
Message-Id: <201305310445.r4V4jx7N018878@svn.freebsd.org>
From: "Justin T. Gibbs" <gibbs@FreeBSD.org>
Date: Fri, 31 May 2013 04:45:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251176 - head/sys/dev/xen/netfront
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 May 2013 04:46:00 -0000

Author: gibbs
Date: Fri May 31 04:45:59 2013
New Revision: 251176
URL: http://svnweb.freebsd.org/changeset/base/251176

Log:
  Make netif_free() safe to call on a partially initialized softc.
  
  Sponsored by:	Spectra Logic Corporation
  MFC after:	1 week

Modified:
  head/sys/dev/xen/netfront/netfront.c

Modified: head/sys/dev/xen/netfront/netfront.c
==============================================================================
--- head/sys/dev/xen/netfront/netfront.c	Fri May 31 04:43:19 2013	(r251175)
+++ head/sys/dev/xen/netfront/netfront.c	Fri May 31 04:45:59 2013	(r251176)
@@ -2177,8 +2177,11 @@ netif_free(struct netfront_info *info)
 	callout_drain(&info->xn_stat_ch);
 	netif_disconnect_backend(info);
 	ifmedia_removeall(&info->sc_media);
-	ether_ifdetach(info->xn_ifp);
-	if_free(info->xn_ifp);
+	if (info->xn_ifp != NULL) {
+		ether_ifdetach(info->xn_ifp);
+		if_free(info->xn_ifp);
+		info->xn_ifp = NULL;
+	}
 }
 
 static void