Skip to content

Commit

Permalink
pf: shared forwarding on non existing interfaces (proposal for opnsen…
Browse files Browse the repository at this point in the history 
…se#52)

when ifp is null packets are marked bad, which means *m points to a freed address. reset *m and return in that case.
  • Loading branch information
@AdSchellevis @fichtner
AdSchellevis authored and fichtner committed May 12, 2020
1 parent f3b129a commit 923c95c
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions sys/netpfil/pf/pf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5669,7 +5669,7 @@ pf_route(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
PF_STATE_UNLOCK(s);
bad:
m_freem(m0);
goto done;
*m = NULL;
}

static void
Expand Down Expand Up @@ -5750,7 +5750,6 @@ pf_route_shared(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *ifp,
if (ip_set_fwdtag(m0, &dst, ifp))
goto bad;

done:
if ((r->rt == PF_DUPTO || r->rt == PF_REPLYTO) && IP_HAS_NEXTHOP(m0)) {
ip_forward(m0, 1);
if (r->rt == PF_REPLYTO)
Expand All @@ -5763,7 +5762,7 @@ pf_route_shared(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *ifp,
PF_STATE_UNLOCK(s);
bad:
m_freem(m0);
goto done;
*m = NULL;
}
#endif /* INET */

Expand Down Expand Up @@ -5890,7 +5889,7 @@ pf_route6(struct mbuf **m, struct pf_rule *r, int dir, struct ifnet *oifp,
PF_STATE_UNLOCK(s);
bad:
m_freem(m0);
goto done;
*m = NULL;
}

static void
Expand Down Expand Up @@ -5975,7 +5974,6 @@ pf_route6_shared(struct mbuf **m, struct pf_rule *r, int dir,
if (ip6_set_fwdtag(m0, &dst, ifp))
goto bad;

done:
if ((r->rt == PF_DUPTO || r->rt == PF_REPLYTO) && IP6_HAS_NEXTHOP(m0)) {
ip6_forward(m0, 1);
if (r->rt == PF_REPLYTO)
Expand All @@ -5989,7 +5987,7 @@ pf_route6_shared(struct mbuf **m, struct pf_rule *r, int dir,
PF_STATE_UNLOCK(s);
bad:
m_freem(m0);
goto done;
*m = NULL;
}
#endif /* INET6 */

Expand Down

0 comments on commit 923c95c

Please sign in to comment.