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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to