Author: gjb
Date: Thu Jul 30 16:06:13 2015
New Revision: 286079
URL: https://svnweb.freebsd.org/changeset/base/286079
Log:
MFC r285999 (kp):
pf: Always initialise pf_fragment.fr_flags
When we allocate the struct pf_fragment in pf_fillup_fragment() we
forgot to initialise the fr_flags field. As a result we sometimes
mistakenly thought the fragment to not be a buffered fragment.
This resulted in panics because we'd end up freeing the pf_fragment
but not removing it from V_pf_fragqueue (believing it to be part of
V_pf_cachequeue). The next time we iterated V_pf_fragqueue we'd use
a freed object and panic.
While here also fix a pf_fragment use after free in pf_normalize_ip().
pf_reassemble() frees the pf_fragment, so we can't use it any more.
X-MFS-To: releng/10.2
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/sys/netpfil/pf/pf_norm.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/netpfil/pf/pf_norm.c
==============================================================================
--- stable/10/sys/netpfil/pf/pf_norm.c Thu Jul 30 15:47:53 2015
(r286078)
+++ stable/10/sys/netpfil/pf/pf_norm.c Thu Jul 30 16:06:13 2015
(r286079)
@@ -433,6 +433,7 @@ pf_fillup_fragment(struct pf_fragment_cm
}
*(struct pf_fragment_cmp *)frag = *key;
+ frag->fr_flags = 0;
frag->fr_timeout = time_second;
frag->fr_maxlen = frent->fe_len;
TAILQ_INIT(&frag->fr_queue);
@@ -1298,9 +1299,6 @@ pf_normalize_ip(struct mbuf **m0, int di
}
}
#endif
- if (frag != NULL && (frag->fr_flags & PFFRAG_DROP))
- goto drop;
-
h = mtod(m, struct ip *);
} else {
/* non-buffering fragment cache (drops or masks overlaps) */
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
