From owner-svn-src-head@freebsd.org  Mon Apr 27 10:00:46 2020
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 939E02B1B7E;
 Mon, 27 Apr 2020 10:00:46 +0000 (UTC)
 (envelope-from afedorov@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 499gJZ3S5pz3HB2;
 Mon, 27 Apr 2020 10:00:46 +0000 (UTC)
 (envelope-from afedorov@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 71D6D884C;
 Mon, 27 Apr 2020 10:00:46 +0000 (UTC)
 (envelope-from afedorov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03RA0kTY052943;
 Mon, 27 Apr 2020 10:00:46 GMT (envelope-from afedorov@FreeBSD.org)
Received: (from afedorov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03RA0kXK052942;
 Mon, 27 Apr 2020 10:00:46 GMT (envelope-from afedorov@FreeBSD.org)
Message-Id: <202004271000.03RA0kXK052942@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: afedorov set sender to
 afedorov@FreeBSD.org using -f
From: Aleksandr Fedorov <afedorov@FreeBSD.org>
Date: Mon, 27 Apr 2020 10:00:46 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r360372 - head/sys/netgraph
X-SVN-Group: head
X-SVN-Commit-Author: afedorov
X-SVN-Commit-Paths: head/sys/netgraph
X-SVN-Commit-Revision: 360372
X-SVN-Commit-Repository: base
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.29
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Apr 2020 10:00:46 -0000

Author: afedorov
Date: Mon Apr 27 10:00:46 2020
New Revision: 360372
URL: https://svnweb.freebsd.org/changeset/base/360372

Log:
  ng_eiface: fix kernel panic due to the racecondition in ng_eiface shutdown.
  
  PR:		244247
  Reported by:	Vladislav V. Prodan <admin@support.od.ua>
  Reviewed by:	vmaffione, lutz_donnerhacke.de
  Approved by:	vmaffione (mentor)
  Sponsored by:	vstack.com
  Differential Revision:	https://reviews.freebsd.org/D24557

Modified:
  head/sys/netgraph/ng_eiface.c

Modified: head/sys/netgraph/ng_eiface.c
==============================================================================
--- head/sys/netgraph/ng_eiface.c	Mon Apr 27 09:45:19 2020	(r360371)
+++ head/sys/netgraph/ng_eiface.c	Mon Apr 27 10:00:46 2020	(r360372)
@@ -623,8 +623,8 @@ ng_eiface_rmnode(node_p node)
 	 * hence we have to change the current vnet context here.
 	 */
 	CURVNET_SET_QUIET(ifp->if_vnet);
-	ifmedia_removeall(&priv->media);
 	ether_ifdetach(ifp);
+	ifmedia_removeall(&priv->media);
 	if_free(ifp);
 	CURVNET_RESTORE();
 	free_unr(V_ng_eiface_unit, priv->unit);