Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-05 11:32:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: use struct nft_verdict within struct nft_data

Browse Source 
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Patrick McHardy 2015-04-11 02:27:32 +01:00 committed by Pablo Neira Ayuso
parent a55e22e92f
commit 1ca2e1702c
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/net/netfilter/nf_tables.h
View File

@ -49,11 +49,8 @@ struct nft_verdict {
struct nft_data { struct nft_data {
union { union {
u32 data[4]; u32 data[4];
struct { struct nft_verdict verdict;
u32 verdict;
struct nft_chain *chain;
};
}; };
} __attribute__((aligned(__alignof__(u64)))); } __attribute__((aligned(__alignof__(u64))));

38
net/netfilter/nf_tables_api.c
View File

@ -4049,10 +4049,10 @@ static int nf_tables_loop_check_setelem(const struct nft_ctx *ctx,
return 0; return 0;
data = nft_set_ext_data(ext); data = nft_set_ext_data(ext);
switch (data->verdict) { switch (data->verdict.code) {
case NFT_JUMP: case NFT_JUMP:
case NFT_GOTO: case NFT_GOTO:
return nf_tables_check_loops(ctx, data->chain); return nf_tables_check_loops(ctx, data->verdict.chain);
default: default:
return 0; return 0;
} }
@ -4085,10 +4085,11 @@ static int nf_tables_check_loops(const struct nft_ctx *ctx,
if (data == NULL) if (data == NULL)
continue; continue;
switch (data->verdict) { switch (data->verdict.code) {
case NFT_JUMP: case NFT_JUMP:
case NFT_GOTO: case NFT_GOTO:
err = nf_tables_check_loops(ctx, data->chain); err = nf_tables_check_loops(ctx,
data->verdict.chain);
if (err < 0) if (err < 0)
return err; return err;
default: default:
@ -4171,15 +4172,17 @@ int nft_validate_register_store(const struct nft_ctx *ctx,
return -EINVAL; return -EINVAL;
if (data != NULL && if (data != NULL &&
(data->verdict == NFT_GOTO || data->verdict == NFT_JUMP)) { (data->verdict.code == NFT_GOTO ||
err = nf_tables_check_loops(ctx, data->chain); data->verdict.code == NFT_JUMP)) {
err = nf_tables_check_loops(ctx, data->verdict.chain);
if (err < 0) if (err < 0)
return err; return err;
if (ctx->chain->level + 1 > data->chain->level) { if (ctx->chain->level + 1 >
data->verdict.chain->level) {
if (ctx->chain->level + 1 == NFT_JUMP_STACK_SIZE) if (ctx->chain->level + 1 == NFT_JUMP_STACK_SIZE)
return -EMLINK; return -EMLINK;
data->chain->level = ctx->chain->level + 1; data->verdict.chain->level = ctx->chain->level + 1;
} }
} }
@ -4220,11 +4223,11 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
if (!tb[NFTA_VERDICT_CODE]) if (!tb[NFTA_VERDICT_CODE])
return -EINVAL; return -EINVAL;
data->verdict = ntohl(nla_get_be32(tb[NFTA_VERDICT_CODE])); data->verdict.code = ntohl(nla_get_be32(tb[NFTA_VERDICT_CODE]));
switch (data->verdict) { switch (data->verdict.code) {
default: default:
switch (data->verdict & NF_VERDICT_MASK) { switch (data->verdict.code & NF_VERDICT_MASK) {
case NF_ACCEPT: case NF_ACCEPT:
case NF_DROP: case NF_DROP:
case NF_QUEUE: case NF_QUEUE:
@ -4250,7 +4253,7 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
return -EOPNOTSUPP; return -EOPNOTSUPP;
chain->use++; chain->use++;
data->chain = chain; data->verdict.chain = chain;
desc->len = sizeof(data); desc->len = sizeof(data);
break; break;
} }
@ -4261,10 +4264,10 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
static void nft_verdict_uninit(const struct nft_data *data) static void nft_verdict_uninit(const struct nft_data *data)
{ {
switch (data->verdict) { switch (data->verdict.code) {
case NFT_JUMP: case NFT_JUMP:
case NFT_GOTO: case NFT_GOTO:
data->chain->use--; data->verdict.chain->use--;
break; break;
} }
} }
@ -4277,13 +4280,14 @@ static int nft_verdict_dump(struct sk_buff *skb, const struct nft_data *data)
if (!nest) if (!nest)
goto nla_put_failure; goto nla_put_failure;
if (nla_put_be32(skb, NFTA_VERDICT_CODE, htonl(data->verdict))) if (nla_put_be32(skb, NFTA_VERDICT_CODE, htonl(data->verdict.code)))
goto nla_put_failure; goto nla_put_failure;
switch (data->verdict) { switch (data->verdict.code) {
case NFT_JUMP: case NFT_JUMP:
case NFT_GOTO: case NFT_GOTO:
if (nla_put_string(skb, NFTA_VERDICT_CHAIN, data->chain->name)) if (nla_put_string(skb, NFTA_VERDICT_CHAIN,
data->verdict.chain->name))
goto nla_put_failure; goto nla_put_failure;
} }
nla_nest_end(skb, nest); nla_nest_end(skb, nest);