Author: glebius
Date: Mon May 18 15:51:27 2015
New Revision: 283063
URL: https://svnweb.freebsd.org/changeset/base/283063

Log:
  A miss from r283061: don't dereference NULL is pf_get_mtag() fails.
  
  PR:           200222
  Submitted by: Franco Fichtner <franco opnsense.org>

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c    Mon May 18 15:46:43 2015        (r283062)
+++ head/sys/netpfil/pf/pf.c    Mon May 18 15:51:27 2015        (r283063)
@@ -5949,9 +5949,11 @@ done:
                                        log = 1;
                                        DPFPRINTF(PF_DEBUG_MISC,
                                            ("pf: failed to allocate tag\n"));
+                               } else {
+                                       pd.pf_mtag->flags |=
+                                           PF_FASTFWD_OURS_PRESENT;
+                                       m->m_flags &= ~M_FASTFWD_OURS;
                                }
-                               pd.pf_mtag->flags |= PF_FASTFWD_OURS_PRESENT;
-                               m->m_flags &= ~M_FASTFWD_OURS;
                        }
                        ip_divert_ptr(*m0, dir ==  PF_IN ? DIR_IN : DIR_OUT);
                        *m0 = NULL;
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to