Date: Thu, 11 Jun 2015 13:26:16 +0000 (UTC) From: Kristof Provost <kp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r284260 - head/sys/netpfil/pf Message-ID: <201506111326.t5BDQGIh063837@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kp Date: Thu Jun 11 13:26:16 2015 New Revision: 284260 URL: https://svnweb.freebsd.org/changeset/base/284260 Log: pf: Save the protocol number in the pf_fragment When we try to look up a pf_fragment with pf_find_fragment() we compare (see pf_frag_compare()) addresses (and family), id but also protocol. We failed to save the protocol to the pf_fragment in pf_fragcache(), resulting in failing reassembly. Differential Revision: https://reviews.freebsd.org/D2772 Modified: head/sys/netpfil/pf/pf_norm.c Modified: head/sys/netpfil/pf/pf_norm.c ============================================================================== --- head/sys/netpfil/pf/pf_norm.c Thu Jun 11 13:05:37 2015 (r284259) +++ head/sys/netpfil/pf/pf_norm.c Thu Jun 11 13:26:16 2015 (r284260) @@ -824,6 +824,7 @@ pf_fragcache(struct mbuf **m0, struct ip (*frag)->fr_src.v4 = h->ip_src; (*frag)->fr_dst.v4 = h->ip_dst; (*frag)->fr_af = AF_INET; + (*frag)->fr_proto = h->ip_p; (*frag)->fr_id = h->ip_id; (*frag)->fr_timeout = time_uptime;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506111326.t5BDQGIh063837>