svn commit: r281536 - head/sys/netpfil/pf
Gleb Smirnoff
glebius at FreeBSD.org
Wed Apr 15 14:30:39 UTC 2015
On Wed, Apr 15, 2015 at 03:25:56PM +0200, Kristof Provost wrote:
K> On 2015-04-15 15:53:02 (+0300), Gleb Smirnoff <glebius at FreeBSD.org> wrote:
K> > On Tue, Apr 14, 2015 at 07:07:37PM +0000, Kristof Provost wrote:
K> > K> Author: kp
K> > K> Date: Tue Apr 14 19:07:37 2015
K> > K> New Revision: 281536
K> > K> URL: https://svnweb.freebsd.org/changeset/base/281536
K> > K>
K> > K> Log:
K> > K> pf: Fix forwarding detection
K> > K>
K> > K> If the direction is not PF_OUT we can never be forwarding. Some input packets
K> > K> have rcvif != ifp (looped back packets), which lead us to ip6_forward() inbound
K> > K> packets, causing panics.
K> > K>
K> > K> Equally, we need to ensure that packets were really received and not locally
K> > K> generated before trying to ip6_forward() them.
K> > K>
K> > K> Differential Revision: https://reviews.freebsd.org/D2286
K> > K> Approved by: gnn(mentor)
K> > K>
K> > K> Modified:
K> > K> head/sys/netpfil/pf/pf.c
K> > K>
K> > K> Modified: head/sys/netpfil/pf/pf.c
K> > K> ==============================================================================
K> > K> --- head/sys/netpfil/pf/pf.c Tue Apr 14 18:57:50 2015 (r281535)
K> > K> +++ head/sys/netpfil/pf/pf.c Tue Apr 14 19:07:37 2015 (r281536)
K> > K> @@ -6070,7 +6070,7 @@ pf_test6(int dir, struct ifnet *ifp, str
K> > K>
K> > K> M_ASSERTPKTHDR(m);
K> > K>
K> > K> - if (ifp != m->m_pkthdr.rcvif)
K> > K> + if (dir == PF_OUT && m->m_pkthdr.rcvif && ifp != m->m_pkthdr.rcvif)
K> > K> fwdir = PF_FWD;
K> >
K> > The ifp argument to pf_test6() is always not NULL, so the (m->m_pkthdr.rcvif)
K> > conjunct is extraneous.
K> >
K> m->pkthdr.rcvif can be NULL though (e.g. when this is a locally
K> generated packet). In that case we don't want to forward, which we'd end
K> up doing because, as you say, ifp won't be NULL.
K>
K> (In other words: If m->pkthdr.rcvif is NULL we don't forward, even if
K> ifp != m->pkthdr.rcvif.)
I'm sorry! My braino.
--
Totus tuus, Glebius.
More information about the svn-src-all
mailing list