Date: Mon, 14 May 2018 22:56:42 +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-11@freebsd.org Subject: svn commit: r333615 - stable/11/sys/netgraph Message-ID: <201805142256.w4EMugIk021596@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805142256.w4EMugIk021596>