Skip to content

Commit

Permalink
netfilter: nf_tables: typo NULL check in _clone() function
Browse files Browse the repository at this point in the history
This should check for NULL in case memory allocation fails.

Reported-by: Julian Wiedmann <jwiedmann.dev@gmail.com>
Fixes: 3b9e2ea ("netfilter: nft_limit: move stateful fields out of expression data")
Fixes: 37f319f ("netfilter: nft_connlimit: move stateful fields out of expression data")
Fixes: 33a24de ("netfilter: nft_last: move stateful fields out of expression data")
Fixes: ed0a0c6 ("netfilter: nft_quota: move stateful fields out of expression data")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Link: https://lore.kernel.org/r/20220110194817.53481-1-pablo@netfilter.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Pablo Neira Ayuso authored and Jakub Kicinski committed Jan 11, 2022
1 parent fe8152b commit 51edb2f
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion net/netfilter/nft_connlimit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_last.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_limit.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion net/netfilter/nft_quota.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 51edb2f

Please sign in to comment.