pf: Ensure that st->kif is obtained in a way which respects the r->rpool->mtx mutex

The redirection pool stored in r->rpool.cur is used for loadbalancing
and cur can change whenever loadbalancing happens, which is for every
new connection. Therefore it can't be trusted outside of pf_map_addr()
and the r->rpool->mtx mutex. After evaluating the ruleset, loadbalancing
decission is made in pf_map_addr() called from within pf_create_state()
and stored in the state itself.

This patch modifies BOUND_IFACE() so that it only uses the information
already stored in the state which has been obtained in a way which
respects the r->rpool->mtx mutex.

Reviewed by:	kp
Differential Revision:	https://reviews.freebsd.org/D43741
This commit is contained in:
Igor Ostapenko
2024-02-05 17:22:31 +01:00
committed by Kristof Provost
parent 8d2e8f7205
commit 6d4a140acf
+7 -10
View File
@@ -413,25 +413,22 @@ VNET_DEFINE(struct pf_limit, pf_limits[PF_LIMIT_MAX]);
} while (0)
static struct pfi_kkif *
BOUND_IFACE(struct pf_krule *r, struct pfi_kkif *k, struct pf_pdesc *pd)
BOUND_IFACE(struct pf_kstate *st, struct pfi_kkif *k)
{
/* Floating unless otherwise specified. */
if (! (r->rule_flag & PFRULE_IFBOUND))
if (! (st->rule.ptr->rule_flag & PFRULE_IFBOUND))
return (V_pfi_all);
/* Don't overrule the interface for states created on incoming packets. */
if (pd->dir == PF_IN)
if (st->direction == PF_IN)
return (k);
/* No route-to, so don't overrrule. */
if (r->rt != PF_ROUTETO)
return (k);
if (r->rpool.cur == NULL)
/* No route-to, so don't overrule. */
if (st->rt != PF_ROUTETO)
return (k);
/* Bind to the route-to interface. */
return (r->rpool.cur->kif);
return (st->rt_kif);
}
#define STATE_INC_COUNTERS(s) \
@@ -5018,7 +5015,7 @@ pf_create_state(struct pf_krule *r, struct pf_krule *nr, struct pf_krule *a,
__func__, nr, sk, nk));
/* Swap sk/nk for PF_OUT. */
if (pf_state_insert(BOUND_IFACE(r, kif, pd), kif,
if (pf_state_insert(BOUND_IFACE(s, kif), kif,
(pd->dir == PF_IN) ? sk : nk,
(pd->dir == PF_IN) ? nk : sk, s)) {
REASON_SET(&reason, PFRES_STATEINS);