MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-07 01:45:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

netfilter: nf_tables: remove annotation to access set timeout while holding lock

Browse Source 
[ Upstream commit 15d8605c0c ]

Mutex is held when adding an element, no need for READ_ONCE, remove it.

Fixes: 123b99619c ("netfilter: nf_tables: honor set timeout and garbage collection updates")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Pablo Neira Ayuso 2024-09-03 01:07:06 +02:00 committed by Greg Kroah-Hartman
parent 9431e5eddc
commit 814b8bc5cc
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/netfilter/nf_tables_api.c
View File

@ -6691,7 +6691,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
return err; return err;
} else if (set->flags & NFT_SET_TIMEOUT && } else if (set->flags & NFT_SET_TIMEOUT &&
!(flags & NFT_SET_ELEM_INTERVAL_END)) { !(flags & NFT_SET_ELEM_INTERVAL_END)) {
timeout = READ_ONCE(set->timeout); timeout = set->timeout;
} }
expiration = 0; expiration = 0;
@ -6798,7 +6798,7 @@ static int nft_add_set_elem(struct nft_ctx *ctx, struct nft_set *set,
if (err < 0) if (err < 0)
goto err_parse_key_end; goto err_parse_key_end;
if (timeout != READ_ONCE(set->timeout)) { if (timeout != set->timeout) {
err = nft_set_ext_add(&tmpl, NFT_SET_EXT_TIMEOUT); err = nft_set_ext_add(&tmpl, NFT_SET_EXT_TIMEOUT);
if (err < 0) if (err < 0)
goto err_parse_key_end; goto err_parse_key_end;