From owner-svn-src-stable-11@freebsd.org  Mon May 14 22:56:42 2018
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id CB178E7DF70;
 Mon, 14 May 2018 22:56:42 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 774C287951;
 Mon, 14 May 2018 22:56:42 +0000 (UTC)
 (envelope-from sbruno@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 5564C2292E;
 Mon, 14 May 2018 22:56:42 +0000 (UTC)
 (envelope-from sbruno@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4EMugcN021597;
 Mon, 14 May 2018 22:56:42 GMT (envelope-from sbruno@FreeBSD.org)
Received: (from sbruno@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4EMugIk021596;
 Mon, 14 May 2018 22:56:42 GMT (envelope-from sbruno@FreeBSD.org)
Message-Id: <201805142256.w4EMugIk021596@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sbruno set sender to
 sbruno@FreeBSD.org using -f
From: Sean Bruno <sbruno@FreeBSD.org>
Date: Mon, 14 May 2018 22:56:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r333615 - stable/11/sys/netgraph
X-SVN-Group: stable-11
X-SVN-Commit-Author: sbruno
X-SVN-Commit-Paths: stable/11/sys/netgraph
X-SVN-Commit-Revision: 333615
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.26
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 14 May 2018 22:56:43 -0000

Author: sbruno
Date: Mon May 14 22:56:41 2018
New Revision: 333615
URL: https://svnweb.freebsd.org/changeset/base/333615

Log:
  MFC r303848
  
  Repair trivial panic in ng_uncallout.  Fixes bugzilla #211031
  
  PR:		211031
  Approved by:	re (gjb)

Modified:
  stable/11/sys/netgraph/ng_base.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/netgraph/ng_base.c
==============================================================================
--- stable/11/sys/netgraph/ng_base.c	Mon May 14 21:57:45 2018	(r333614)
+++ stable/11/sys/netgraph/ng_base.c	Mon May 14 22:56:41 2018	(r333615)
@@ -3815,7 +3815,7 @@ ng_uncallout(struct callout *c, node_p node)
 	item = c->c_arg;
 	/* Do an extra check */
 	if ((rval > 0) && (c->c_func == &ng_callout_trampoline) &&
-	    (NGI_NODE(item) == node)) {
+	    (item != NULL) && (NGI_NODE(item) == node)) {
 		/*
 		 * We successfully removed it from the queue before it ran
 		 * So now we need to unreference everything that was