averello/linux-stable-mirror
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2026-09-22 09:34:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

netfilter: nft_set_pipapo: merge deactivate helper into caller

Browse Source 
[ Upstream commit c5444786d0 ]

Its the only remaining call site so there is no need for this to
be separated anymore.

Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Stable-dep-of: 47e65eff50 ("netfilter: nft_set_pipapo: don't leak bad clone into future transaction")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Florian Westphal
2026-08-03 11:15:36 +02:00
committed by Greg Kroah-Hartman
parent 8e264996d9
commit 840daa6bc4
1 changed files with 11 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
net/netfilter/nft_set_pipapo.c
+11 -32
View File
@@ -1854,35 +1854,7 @@ static void nft_pipapo_activate(const struct net *net,
}
/**
* pipapo_deactivate() - Check that element is in set, mark as inactive
* @net: Network namespace
* @set: nftables API set representation
* @data: Input key data
* @ext: nftables API extension pointer, used to check for end element
*
* This is a convenience function that can be called from both
* nft_pipapo_deactivate() and nft_pipapo_flush(), as they are in fact the same
* operation.
*
* Return: deactivated element if found, NULL otherwise.
*/
static void *pipapo_deactivate(const struct net *net, const struct nft_set *set,
const u8 *data, const struct nft_set_ext *ext)
{
struct nft_pipapo_elem *e;
e = pipapo_get(net, set, data, nft_genmask_next(net),
nft_net_tstamp(net), GFP_KERNEL);
if (IS_ERR(e))
return NULL;
nft_set_elem_change_active(net, set, &e->ext);
return e;
}
/**
* nft_pipapo_deactivate() - Call pipapo_deactivate() to make element inactive
* nft_pipapo_deactivate() - Search for element and make it inactive
* @net: Network namespace
* @set: nftables API set representation
* @elem: nftables API element representation containing key data
@@ -1893,13 +1865,20 @@ static void *nft_pipapo_deactivate(const struct net *net,
const struct nft_set *set,
const struct nft_set_elem *elem)
{
const struct nft_set_ext *ext = nft_set_elem_ext(set, elem->priv);
struct nft_pipapo_elem *e;
return pipapo_deactivate(net, set, (const u8 *)elem->key.val.data, ext);
e = pipapo_get(net, set, (const u8 *)elem->key.val.data,
nft_genmask_next(net), nft_net_tstamp(net), GFP_KERNEL);
if (IS_ERR(e))
return NULL;
nft_set_elem_change_active(net, set, &e->ext);
return &e->priv;
}
/**
* nft_pipapo_flush() - Call pipapo_deactivate() to make element inactive
* nft_pipapo_flush() - make element inactive
* @net: Network namespace
* @set: nftables API set representation
* @elem: nftables API element representation containing key data