netfilter: nft_compat: ebtables emulation must reject non-bridge targets
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: nft_compat: ebtables emulation must reject non-bridge targets
xtables targets return netfilter verdicts: NF_ACCEPT, NF_DROP, and so on. ebtables targets return incompatible verdicts: EBT_ACCEPT,EBT_DROP, ... We cannot allow fallback to NFPROTO_UNSPEC.
ebtables doesn't permit this since11ff7288beb2 ("netfilter: ebtables: reject non-bridge targets") but that commit missed the nft_compat layer.
---
I'd still apply the originally proposed patch:
https://patchwork.ozlabs.org/project/netfilter-devel/patch/5722ce33544cc22da3f811de77ab57847eb58366.1781144570.git.bronzed_45_vested@icloud.com/
(or, alternatively, split the UNSPEC into explicit
NFPROTO_IPV4/NFPROTO_IPV6), this fix is technically for a different
bug, even though it does prevent to original bug as well.
net/netfilter/nft_compat.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
net/netfilter/nft_compat.c +21 -3
@@ -397,6 +397,22 @@ static int nft_target_validate(const struct nft_ctx *ctx,return 0 ; } +static int nft_target_bridge_validate (const struct nft_ctx *ctx, +const struct nft_expr *expr) +{ +struct xt_target *target = expr->ops->data; + +/* Do not allow UNSPEC to stand-in for NFPROTO_BRIDGE +* targets: they are incompatible. ebtables targets return +* EBT_ACCEPT, DROP and so on which are not compatible with +* NF_ACCEPT, NF_DROP and so on. +*/ +if (target->family !=NFPROTO_BRIDGE ) +return -ENOENT ; + +return nft_target_validate (ctx, expr); +} + static void __nft_match_eval(const struct nft_expr *expr, struct nft_regs *regs, const struct nft_pktinfo *pkt,
@@ -932,13 +948,15 @@ nft_target_select_ops(const struct nft_ctx *ctx, ops->init = nft_target_init; ops->destroy = nft_target_destroy; ops->dump = nft_target_dump; - ops->validate = nft_target_validate; ops->data = target; -if (family ==NFPROTO_BRIDGE ) +if (family ==NFPROTO_BRIDGE ) { ops->eval = nft_target_eval_bridge; -else + ops->validate = nft_target_bridge_validate; + }else { ops->eval = nft_target_eval_xt; + ops->validate = nft_target_validate; + }return ops; err:
Signature · 1 line
2.53.0