From owner-svn-src-head@freebsd.org Fri Aug 12 18:38:52 2016 Return-Path: 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 2CC55BB7580; Fri, 12 Aug 2016 18:38:52 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (glebi.us [96.95.210.25]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "cell.glebi.us", Issuer "cell.glebi.us" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id F137A1A60; Fri, 12 Aug 2016 18:38:51 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from cell.glebi.us (localhost [127.0.0.1]) by cell.glebi.us (8.15.2/8.15.2) with ESMTPS id u7CIcjuj063526 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 12 Aug 2016 11:38:45 -0700 (PDT) (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by cell.glebi.us (8.15.2/8.15.2/Submit) id u7CIcjYR063525; Fri, 12 Aug 2016 11:38:45 -0700 (PDT) (envelope-from glebius@FreeBSD.org) X-Authentication-Warning: cell.glebi.us: glebius set sender to glebius@FreeBSD.org using -f Date: Fri, 12 Aug 2016 11:38:45 -0700 From: Gleb Smirnoff To: Sean Bruno Cc: Michael Zhilin , ngie@FreeBSD.org, sergey.dyatko@gmail.com, src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r303848 - head/sys/netgraph Message-ID: <20160812183845.GJ1076@FreeBSD.org> References: <201608081931.u78JV1Ve026577@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201608081931.u78JV1Ve026577@repo.freebsd.org> User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Aug 2016 18:38:52 -0000 Hi! Sorry, I'm afraid this isn't a correct fix. Simply adding checks against NULL to avoid panics at race conditions isn't a solution. I can provide help with this problem. It must be related to my callout changes, in case if this is a very recent problem. Is it a recent problem or an old one? On Mon, Aug 08, 2016 at 07:31:01PM +0000, Sean Bruno wrote: S> Author: sbruno S> Date: Mon Aug 8 19:31:01 2016 S> New Revision: 303848 S> URL: https://svnweb.freebsd.org/changeset/base/303848 S> S> Log: S> Avoid panic from ng_uncallout when unpluggin ethernet cable with active S> PPTP VPN connection. S> S> Submitted by: Michael Zhilin S> Reviewed by: ngie S> MFC after: 3 days S> Differential Revision: https://reviews.freebsd.org/D7209 S> S> Modified: S> head/sys/netgraph/ng_base.c S> S> Modified: head/sys/netgraph/ng_base.c S> ============================================================================== S> --- head/sys/netgraph/ng_base.c Mon Aug 8 18:57:50 2016 (r303847) S> +++ head/sys/netgraph/ng_base.c Mon Aug 8 19:31:01 2016 (r303848) S> @@ -3815,7 +3815,7 @@ ng_uncallout(struct callout *c, node_p n S> item = c->c_arg; S> /* Do an extra check */ S> if ((rval > 0) && (c->c_func == &ng_callout_trampoline) && S> - (NGI_NODE(item) == node)) { S> + (item != NULL) && (NGI_NODE(item) == node)) { S> /* S> * We successfully removed it from the queue before it ran S> * So now we need to unreference everything that was S> _______________________________________________ S> svn-src-all@freebsd.org mailing list S> https://lists.freebsd.org/mailman/listinfo/svn-src-all S> To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org" -- Totus tuus, Glebius.