netfilter: nf_tables: typo NULL check in _clone() function
Subsystems (3)
Pablo Neira Ayuso
maintainerPATCH 1/1 netfilter: nf_tables: typo NULL check in _clone() function
This should check for NULL in case memory allocation fails.
Reported-by Julian Wiedmann <[email protected]>
Fixes 3b9e2ea6c11b ("netfilter: nft_limit: move stateful fields out of expression data")
Fixes 37f319f37d90 ("netfilter: nft_connlimit: move stateful fields out of expression data")
Fixes 33a24de37e81 ("netfilter: nft_last: move stateful fields out of expression data")
Fixes ed0a0c60f0e5 ("netfilter: nft_quota: move stateful fields out of expression data")
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
Please, directly apply to net-next, thanks
net/netfilter/nft_connlimit.c | 2 +- net/netfilter/nft_last.c | 2 +- net/netfilter/nft_limit.c | 2 +- net/netfilter/nft_quota.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
net/netfilter/nft_connlimit.c +1 -1
@@ -206,7 +206,7 @@ static int nft_connlimit_clone(struct nft_expr *dst, const struct nft_expr *src)struct nft_connlimit *priv_src =nft_expr_priv (src); priv_dst->list =kmalloc (sizeof (*priv_dst->list),GFP_ATOMIC ); -if (priv_dst->list) +if (!priv_dst->list)return -ENOMEM ;nf_conncount_list_init (priv_dst->list);
net/netfilter/nft_last.c +1 -1
@@ -106,7 +106,7 @@ static int nft_last_clone(struct nft_expr *dst, const struct nft_expr *src)struct nft_last_priv *priv_dst =nft_expr_priv (dst); priv_dst->last =kzalloc (sizeof (*priv_dst->last),GFP_ATOMIC ); -if (priv_dst->last) +if (!priv_dst->last)return -ENOMEM ;return 0 ;
net/netfilter/nft_limit.c +1 -1
@@ -145,7 +145,7 @@ static int nft_limit_clone(struct nft_limit_priv *priv_dst, priv_dst->invert = priv_src->invert; priv_dst->limit =kmalloc (sizeof (*priv_dst->limit),GFP_ATOMIC ); -if (priv_dst->limit) +if (!priv_dst->limit)return -ENOMEM ;spin_lock_init (&priv_dst->limit->lock);
net/netfilter/nft_quota.c +1 -1
@@ -237,7 +237,7 @@ static int nft_quota_clone(struct nft_expr *dst, const struct nft_expr *src)struct nft_quota *priv_dst =nft_expr_priv (dst); priv_dst->consumed =kmalloc (sizeof (*priv_dst->consumed),GFP_ATOMIC ); -if (priv_dst->consumed) +if (!priv_dst->consumed)return -ENOMEM ;atomic64_set (priv_dst->consumed,0 );
Signature · 1 line
2.30.2
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 10 lines · On Mon, 10 Jan 2022 20:48:17 +0100 you wrote:
This should check for NULL in case memory allocation fails.
Reported-by Julian Wiedmann <[email protected]>Fixes 3b9e2ea6c11b ("netfilter: nft_limit: move stateful fields out of expression data")Fixes 37f319f37d90 ("netfilter: nft_connlimit: move stateful fields out of expression data")Fixes 33a24de37e81 ("netfilter: nft_last: move stateful fields out of expression data")Fixes ed0a0c60f0e5 ("netfilter: nft_quota: move stateful fields out of expression data")Signed-off-by Pablo Neira Ayuso <[email protected]>[...]
Here is the summary with links:
- [net-next] netfilter: nf_tables: typo NULL check in _clone() function
https://git.kernel.org/netdev/net/c/51edb2ff1c6f
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html