提交 0e69efe0 编写于 作者: P Pablo Neira Ayuso 提交者: Zheng Zengkai

netfilter: nf_tables: disallow jump to implicit chain from set element

stable inclusion
from stable-v5.10.140
commit 6301a73bd83d94b9b3eab8581adb04e40fb5f079
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I63FTT

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=6301a73bd83d94b9b3eab8581adb04e40fb5f079

--------------------------------

[ Upstream commit f323ef3a ]

Extend struct nft_data_desc to add a flag field that specifies
nft_data_init() is being called for set element data.

Use it to disallow jump to implicit chain from set element, only jump
to chain via immediate expression is allowed.

Fixes: d0e2c7de ("netfilter: nf_tables: add NFT_CHAIN_BINDING")
Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: NSasha Levin <sashal@kernel.org>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>

 Conflicts:
	net/netfilter/nf_tables_api.c
Reviewed-by: NWei Li <liwei391@huawei.com>
上级 a19bd572
...@@ -176,10 +176,15 @@ struct nft_ctx { ...@@ -176,10 +176,15 @@ struct nft_ctx {
bool report; bool report;
}; };
enum nft_data_desc_flags {
NFT_DATA_DESC_SETELEM = (1 << 0),
};
struct nft_data_desc { struct nft_data_desc {
enum nft_data_types type; enum nft_data_types type;
unsigned int size; unsigned int size;
unsigned int len; unsigned int len;
unsigned int flags;
}; };
int nft_data_init(const struct nft_ctx *ctx, struct nft_data *data, int nft_data_init(const struct nft_ctx *ctx, struct nft_data *data,
......
...@@ -4865,6 +4865,7 @@ static int nft_setelem_parse_data(struct nft_ctx *ctx, struct nft_set *set, ...@@ -4865,6 +4865,7 @@ static int nft_setelem_parse_data(struct nft_ctx *ctx, struct nft_set *set,
desc->type = dtype; desc->type = dtype;
desc->size = NFT_DATA_VALUE_MAXLEN; desc->size = NFT_DATA_VALUE_MAXLEN;
desc->len = set->dlen; desc->len = set->dlen;
desc->flags = NFT_DATA_DESC_SETELEM;
return nft_data_init(ctx, data, desc, attr); return nft_data_init(ctx, data, desc, attr);
} }
...@@ -8679,6 +8680,9 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data, ...@@ -8679,6 +8680,9 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
return -EOPNOTSUPP; return -EOPNOTSUPP;
if (nft_chain_is_bound(chain)) if (nft_chain_is_bound(chain))
return -EINVAL; return -EINVAL;
if (desc->flags & NFT_DATA_DESC_SETELEM &&
chain->flags & NFT_CHAIN_BINDING)
return -EINVAL;
chain->use++; chain->use++;
data->verdict.chain = chain; data->verdict.chain = chain;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册