Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ef1efd1 authored Jul 05, 2019 by Pablo Neira Ayuso

netfilter: nf_tables: force module load in case select_ops() returns -EAGAIN



nft_meta needs to pull in the nft_meta_bridge module in case that this
is a bridge family rule from the select_ops() path.

Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

parent 9cff126f

net/netfilter/nf_tables_api.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -2144,6 +2144,12 @@ static int nf_tables_expr_parse(const struct nft_ctx *ctx,
		(const struct nlattr * const *)info->tb);
		if (IS_ERR(ops)) {
		err = PTR_ERR(ops);
		#ifdef CONFIG_MODULES
		if (err == -EAGAIN)
		nft_expr_type_request_module(ctx->net,
		ctx->family,
		tb[NFTA_EXPR_NAME]);
		#endif
		goto err1;
		}
		} else

net/netfilter/nft_meta.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -519,6 +519,10 @@ nft_meta_select_ops(const struct nft_ctx *ctx,
		if (tb[NFTA_META_DREG] && tb[NFTA_META_SREG])
		return ERR_PTR(-EINVAL);

		#ifdef CONFIG_NF_TABLES_BRIDGE
		if (ctx->family == NFPROTO_BRIDGE)
		return ERR_PTR(-EAGAIN);
		#endif
		if (tb[NFTA_META_DREG])
		return &nft_meta_get_ops;