korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-05 10:04:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nf_tables: move base hook annotation to init helper

Browse Source 
coverity scanner says:
2187  if (nft_is_base_chain(chain)) {
vvv   CID 1505166:  Memory - corruptions  (UNINIT)
vvv   Using uninitialized value "basechain".
2188  basechain->ops.hook_ops_type = NF_HOOK_OP_NF_TABLES;

... I don't see how nft_is_base_chain() can evaluate to true
while basechain pointer is garbage.

However, it seems better to place the NF_HOOK_OP_NF_TABLES annotation
in nft_basechain_hook_init() instead.

Reported-by: coverity-bot <keescook+coverity-bot@chromium.org>
Addresses-Coverity-ID: 1505166 ("Memory - corruptions")
Fixes: 65b8b7bfc5284f ("netfilter: annotate nf_tables base hook ops")
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal 2021-06-08 23:06:07 +02:00 committed by Pablo Neira Ayuso
parent d4fb1f954f
commit c5c6accd7b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/netfilter/nf_tables_api.c
View File

@ -1997,11 +1997,12 @@ static void nft_basechain_hook_init(struct nf_hook_ops *ops, u8 family,
const struct nft_chain_hook *hook, const struct nft_chain_hook *hook,
struct nft_chain *chain) struct nft_chain *chain)
{ {
ops->pf = family; ops->pf = family;
ops->hooknum = hook->num; ops->hooknum = hook->num;
ops->priority = hook->priority; ops->priority = hook->priority;
ops->priv = chain; ops->priv = chain;
ops->hook = hook->type->hooks[ops->hooknum]; ops->hook = hook->type->hooks[ops->hooknum];
ops->hook_ops_type = NF_HOOK_OP_NF_TABLES;
} }
static int nft_basechain_init(struct nft_base_chain *basechain, u8 family, static int nft_basechain_init(struct nft_base_chain *basechain, u8 family,
@ -2168,10 +2169,8 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask,
} }
nft_trans_chain_policy(trans) = NFT_CHAIN_POLICY_UNSET; nft_trans_chain_policy(trans) = NFT_CHAIN_POLICY_UNSET;
if (nft_is_base_chain(chain)) { if (nft_is_base_chain(chain))
basechain->ops.hook_ops_type = NF_HOOK_OP_NF_TABLES;
nft_trans_chain_policy(trans) = policy; nft_trans_chain_policy(trans) = policy;
}
err = nft_chain_add(table, chain); err = nft_chain_add(table, chain);
if (err < 0) { if (err < 0) {