D2189.diff
No OneTemporary
Actions

Size

798 B

Referenced Files

None

Subscribers

None

D2189.diff
View Options

	Index: sys/netpfil/pf/pf_norm.c
	===================================================================
	--- sys/netpfil/pf/pf_norm.c
	+++ sys/netpfil/pf/pf_norm.c
	@@ -573,11 +573,8 @@
	frent = TAILQ_FIRST(&frag->fr_queue);
	next = TAILQ_NEXT(frent, fr_next);

	- /* Magic from ip_input. */
	m = frent->fe_m;
	- m2 = m->m_next;
	- m->m_next = NULL;
	- m_cat(m, m2);
	+ m_adj(m, (frent->fe_hdrlen + frent->fe_len) - m->m_pkthdr.len);
	uma_zfree(V_pf_frent_z, frent);
	for (frent = next; frent != NULL; frent = next) {
	next = TAILQ_NEXT(frent, fr_next);
	@@ -585,6 +582,9 @@
	m2 = frent->fe_m;
	/* Strip off ip header. */
	m_adj(m2, frent->fe_hdrlen);
	+ /* Strip off any trailing bytes. */
	+ m_adj(m2, frent->fe_len - m2->m_pkthdr.len);
	+
	uma_zfree(V_pf_frent_z, frent);
	m_cat(m, m2);
	}