netfilter: nft_set_pipapo_avx2: don't return non-matching entry on expiry

New test case fails unexpectedly when avx2 matching functions are used.

The test first loads a ranomly generated pipapo set
with 'ipv4 . port' key, i.e.  nft -f foo.

This works.  Then, it reloads the set after a flush:
(echo flush set t s; cat foo) | nft -f -

This is expected to work, because its the same set after all and it was
already loaded once.

But with avx2, this fails: nft reports a clashing element.

The reported clash is of following form:

    We successfully re-inserted
      a . b
      c . d

Then we try to insert a . d

avx2 finds the already existing a . d, which (due to 'flush set') is marked
as invalid in the new generation.  It skips the element and moves to next.

Due to incorrect masking, the skip-step finds the next matching
element *only considering the first field*,

i.e. we return the already reinserted "a . b", even though the
last field is different and the entry should not have been matched.

No such error is reported for the generic c implementation (no avx2) or when
the last field has to use the 'nft_pipapo_avx2_lookup_slow' fallback.

Bisection points to
7711f4bb4b36 ("netfilter: nft_set_pipapo: fix range overlap detection")
but that fix merely uncovers this bug.

Before this commit, the wrong element is returned, but erronously
reported as a full, identical duplicate.

The root-cause is too early return in the avx2 match functions.
When we process the last field, we should continue to process data
until the entire input size has been consumed to make sure no stale
bits remain in the map.

Link: https://lore.kernel.org/netfilter-devel/20260321152506.037f68c0@elisabeth/
Signed-off-by: Florian Westphal <fw@strlen.de>
Reviewed-by: Stefano Brivio <sbrivio@redhat.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

diff --git a/net/netfilter/nft_set_pipapo_avx2.c b/net/netfilter/nft_set_pipapo_avx2.c
index 7ff90325c97fa8a4162d5b60931fbba5deb597f2..6395982e4d95c5693bd19084f7d67872457e1855 100644 (file)
--- a/net/netfilter/nft_set_pipapo_avx2.c
+++ b/net/netfilter/nft_set_pipapo_avx2.c
@@ -242,7 +242,7 @@ static int nft_pipapo_avx2_lookup_4b_2(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -319,7 +319,7 @@ static int nft_pipapo_avx2_lookup_4b_4(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -414,7 +414,7 @@ static int nft_pipapo_avx2_lookup_4b_8(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -505,7 +505,7 @@ static int nft_pipapo_avx2_lookup_4b_12(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -641,7 +641,7 @@ static int nft_pipapo_avx2_lookup_4b_32(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -699,7 +699,7 @@ static int nft_pipapo_avx2_lookup_8b_1(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -764,7 +764,7 @@ static int nft_pipapo_avx2_lookup_8b_2(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -839,7 +839,7 @@ static int nft_pipapo_avx2_lookup_8b_4(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -925,7 +925,7 @@ static int nft_pipapo_avx2_lookup_8b_6(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;
@@ -1019,7 +1019,7 @@ static int nft_pipapo_avx2_lookup_8b_16(unsigned long *map, unsigned long *fill,
 
                b = nft_pipapo_avx2_refill(i_ul, &map[i_ul], fill, f->mt, last);
                if (last)
-                       return b;
+                       ret = b;
 
                if (unlikely(ret == -1))
                        ret = b / XSAVE_YMM_SIZE;