Date: Tue, 15 May 2018 13:19:00 +0000 (UTC) From: Sean Bruno <sbruno@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r333629 - stable/10/sys/netgraph Message-ID: <201805151319.w4FDJ0kW055855@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sbruno Date: Tue May 15 13:19:00 2018 New Revision: 333629 URL: https://svnweb.freebsd.org/changeset/base/333629 Log: MFC r303848 Repair trivial panic in ng_uncallout. Fixes bugzilla #211031 PR: 211031 Modified: stable/10/sys/netgraph/ng_base.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/netgraph/ng_base.c ============================================================================== --- stable/10/sys/netgraph/ng_base.c Tue May 15 12:11:52 2018 (r333628) +++ stable/10/sys/netgraph/ng_base.c Tue May 15 13:19:00 2018 (r333629) @@ -3813,7 +3813,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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805151319.w4FDJ0kW055855>