aboutsummaryrefslogtreecommitdiff
path: root/sys/netpfil/pf
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2015-05-18 15:51:27 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2015-05-18 15:51:27 +0000
commit78680d05d1fb21665527ca7e6c2ef8c3a22b31fb (patch)
tree7a7849c70b2d76722639042943531f42fee0668f /sys/netpfil/pf
parentb32852bef6232b5936306389bf6f543fcae9f600 (diff)
downloadsrc-78680d05d1fb21665527ca7e6c2ef8c3a22b31fb.tar.gz
src-78680d05d1fb21665527ca7e6c2ef8c3a22b31fb.zip
A miss from r283061: don't dereference NULL is pf_get_mtag() fails.
PR: 200222 Submitted by: Franco Fichtner <franco opnsense.org>
Notes
Notes: svn path=/head/; revision=283063
Diffstat (limited to 'sys/netpfil/pf')
-rw-r--r--sys/netpfil/pf/pf.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c
index da74ecf5fc5f..abe8c2645aee 100644
--- a/sys/netpfil/pf/pf.c
+++ b/sys/netpfil/pf/pf.c
@@ -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;