From owner-svn-src-head@freebsd.org  Wed Jun  3 16:57:30 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 D178C33BA5A;
 Wed,  3 Jun 2020 16:57:30 +0000 (UTC)
 (envelope-from freqlabs@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)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 49cZpL5GFTz3Zjb;
 Wed,  3 Jun 2020 16:57:30 +0000 (UTC)
 (envelope-from freqlabs@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 ABDA011503;
 Wed,  3 Jun 2020 16:57:30 +0000 (UTC)
 (envelope-from freqlabs@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 053GvUD6003758;
 Wed, 3 Jun 2020 16:57:30 GMT (envelope-from freqlabs@FreeBSD.org)
Received: (from freqlabs@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 053GvUut003757;
 Wed, 3 Jun 2020 16:57:30 GMT (envelope-from freqlabs@FreeBSD.org)
Message-Id: <202006031657.053GvUut003757@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: freqlabs set sender to
 freqlabs@FreeBSD.org using -f
From: Ryan Moeller <freqlabs@FreeBSD.org>
Date: Wed, 3 Jun 2020 16:57:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r361756 - head/sys/netinet6
X-SVN-Group: head
X-SVN-Commit-Author: freqlabs
X-SVN-Commit-Paths: head/sys/netinet6
X-SVN-Commit-Revision: 361756
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.33
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: Wed, 03 Jun 2020 16:57:30 -0000

Author: freqlabs
Date: Wed Jun  3 16:57:30 2020
New Revision: 361756
URL: https://svnweb.freebsd.org/changeset/base/361756

Log:
  scope6: Check for NULL afdata before dereferencing
  
  Narrows the race window with if_detach.
  
  Approved by:	mav (mentor)
  MFC after:	3 days
  Sponsored by:	iXsystems, Inc.
  Differential Revision:	https://reviews.freebsd.org/D25017

Modified:
  head/sys/netinet6/scope6.c

Modified: head/sys/netinet6/scope6.c
==============================================================================
--- head/sys/netinet6/scope6.c	Wed Jun  3 16:51:30 2020	(r361755)
+++ head/sys/netinet6/scope6.c	Wed Jun  3 16:57:30 2020	(r361756)
@@ -422,6 +422,10 @@ in6_setscope(struct in6_addr *in6, struct ifnet *ifp, 
 			struct epoch_tracker et;
 
 			NET_EPOCH_ENTER(et);
+			if (ifp->if_afinfo[AF_INET6] == NULL) {
+				NET_EPOCH_EXIT(et);
+				return (ENETDOWN);
+			}
 			sid = SID(ifp);
 			zoneid = sid->s6id_list[scope];
 			NET_EPOCH_EXIT(et);