Skip to content

Commit 80efd29

Browse files
Florian Westphalummakynes
authored andcommitted
netfilter: nft_set_pipapo: make pipapo_clone helper return NULL
Currently it returns an error pointer, but the only possible failure is ENOMEM. After a followup patch, we'd need to discard the errno code, i.e. x = pipapo_clone() if (IS_ERR(x)) return NULL or make more changes to fix up callers to expect IS_ERR() code from set->ops->deactivate(). So simplify this and make it return ptr-or-null. Signed-off-by: Florian Westphal <fw@strlen.de> Reviewed-by: Stefano Brivio <sbrivio@redhat.com> Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
1 parent a590f47 commit 80efd29

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

net/netfilter/nft_set_pipapo.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,7 +1395,7 @@ static int nft_pipapo_insert(const struct net *net, const struct nft_set *set,
13951395
* pipapo_clone() - Clone matching data to create new working copy
13961396
* @old: Existing matching data
13971397
*
1398-
* Return: copy of matching data passed as 'old', error pointer on failure
1398+
* Return: copy of matching data passed as 'old' or NULL.
13991399
*/
14001400
static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old)
14011401
{
@@ -1405,7 +1405,7 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old)
14051405

14061406
new = kmalloc(struct_size(new, f, old->field_count), GFP_KERNEL);
14071407
if (!new)
1408-
return ERR_PTR(-ENOMEM);
1408+
return NULL;
14091409

14101410
new->field_count = old->field_count;
14111411
new->bsize_max = old->bsize_max;
@@ -1477,7 +1477,7 @@ static struct nft_pipapo_match *pipapo_clone(struct nft_pipapo_match *old)
14771477
free_percpu(new->scratch);
14781478
kfree(new);
14791479

1480-
return ERR_PTR(-ENOMEM);
1480+
return NULL;
14811481
}
14821482

14831483
/**
@@ -1797,7 +1797,7 @@ static void nft_pipapo_commit(struct nft_set *set)
17971797
return;
17981798

17991799
new_clone = pipapo_clone(priv->clone);
1800-
if (IS_ERR(new_clone))
1800+
if (!new_clone)
18011801
return;
18021802

18031803
priv->dirty = false;
@@ -1821,7 +1821,7 @@ static void nft_pipapo_abort(const struct nft_set *set)
18211821
m = rcu_dereference_protected(priv->match, nft_pipapo_transaction_mutex_held(set));
18221822

18231823
new_clone = pipapo_clone(m);
1824-
if (IS_ERR(new_clone))
1824+
if (!new_clone)
18251825
return;
18261826

18271827
priv->dirty = false;
@@ -2269,8 +2269,8 @@ static int nft_pipapo_init(const struct nft_set *set,
22692269

22702270
/* Create an initial clone of matching data for next insertion */
22712271
priv->clone = pipapo_clone(m);
2272-
if (IS_ERR(priv->clone)) {
2273-
err = PTR_ERR(priv->clone);
2272+
if (!priv->clone) {
2273+
err = -ENOMEM;
22742274
goto out_free;
22752275
}
22762276

0 commit comments

Comments
 (0)