netfilter: move nf_tables base hook annotation to init helper
Subsystems (2)
Florian Westphal
maintainerPATCH 1/1 netfilter: move nf_tables base hook annotation to init helper
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 <[email protected]>
Addresses-Coverity-ID: 1505166 ("Memory - corruptions")
Fixes 65b8b7bfc5284f ("netfilter: annotate nf_tables base hook ops")
Signed-off-by Florian Westphal <[email protected]>
--- net/netfilter/nf_tables_api.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/netfilter/nf_tables_api.c +7 -8
@@ -2001,11 +2001,12 @@ static void nft_basechain_hook_init(struct nf_hook_ops *ops, u8 family,const struct nft_chain_hook *hook, struct nft_chain *chain) { - ops->pf = family; - ops->hooknum = hook->num; - ops->priority = hook->priority; - ops->priv = chain; - ops->hook = hook->type->hooks[ops->hooknum]; + ops->pf = family; + ops->hooknum = hook->num; + ops->priority = hook->priority; + ops->priv = chain; + 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,
@@ -2172,10 +2173,8 @@ static int nf_tables_addchain(struct nft_ctx *ctx, u8 family, u8 genmask, }nft_trans_chain_policy (trans) =NFT_CHAIN_POLICY_UNSET ; -if (nft_is_base_chain (chain)) { - basechain->ops.hook_ops_type =NF_HOOK_OP_NF_TABLES ; +if (nft_is_base_chain (chain))nft_trans_chain_policy (trans) = policy; - } err =nft_chain_add (table, chain);if (err <0 ) {
Signature · 1 line
2.31.1
Quoted 11 lines · Florian Westphal
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_TABLESannotation innft_basechain_hook_init()instead.
Applied, thanks.