Skip to content

Commit ddbd8be

Browse files
author
Florian Westphal
committed
netfilter: nf_tables: fix spurious set element insertion failure
On some platforms there is a padding hole in the nft_verdict structure, between the verdict code and the chain pointer. On element insertion, if the new element clashes with an existing one and NLM_F_EXCL flag isn't set, we want to ignore the -EEXIST error as long as the data associated with duplicated element is the same as the existing one. The data equality check uses memcmp. For normal data (NFT_DATA_VALUE) this works fine, but for NFT_DATA_VERDICT padding area leads to spurious failure even if the verdict data is the same. This then makes the insertion fail with 'already exists' error, even though the new "key : data" matches an existing entry and userspace told the kernel that it doesn't want to receive an error indication. Fixes: c016c7e ("netfilter: nf_tables: honor NLM_F_EXCL flag in set element insertion") Signed-off-by: Florian Westphal <fw@strlen.de>
1 parent ac52864 commit ddbd8be

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/netfilter/nf_tables_api.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10517,6 +10517,9 @@ static int nft_verdict_init(const struct nft_ctx *ctx, struct nft_data *data,
1051710517

1051810518
if (!tb[NFTA_VERDICT_CODE])
1051910519
return -EINVAL;
10520+
10521+
/* zero padding hole for memcmp */
10522+
memset(data, 0, sizeof(*data));
1052010523
data->verdict.code = ntohl(nla_get_be32(tb[NFTA_VERDICT_CODE]));
1052110524

1052210525
switch (data->verdict.code) {

0 commit comments

Comments
 (0)