Patch "selftests/bpf: Fix erroneous bitmask operation" has been added to the 6.1-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Fix erroneous bitmask operation

to the 6.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-fix-erroneous-bitmask-operation.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 352cfb661c785fd7b6f888d3c352c84814d27da5
Author: Jeroen van Ingen Schenau <jeroen.vaningenschenau@xxxxxxxxxxxxx>
Date:   Thu Nov 30 13:03:53 2023 +0100

    selftests/bpf: Fix erroneous bitmask operation
    
    [ Upstream commit b6a3451e0847d5d70fb5fa2b2a80ab9f80bf2c7b ]
    
    xdp_synproxy_kern.c is a BPF program that generates SYN cookies on
    allowed TCP ports and sends SYNACKs to clients, accelerating synproxy
    iptables module.
    
    Fix the bitmask operation when checking the status of an existing
    conntrack entry within tcp_lookup() function. Do not AND with the bit
    position number, but with the bitmask value to check whether the entry
    found has the IPS_CONFIRMED flag set.
    
    Fixes: fb5cd0ce70d4 ("selftests/bpf: Add selftests for raw syncookie helpers")
    Signed-off-by: Jeroen van Ingen Schenau <jeroen.vaningenschenau@xxxxxxxxxxxxx>
    Signed-off-by: Daniel Borkmann <daniel@xxxxxxxxxxxxx>
    Tested-by: Minh Le Hoang <minh.lehoang@xxxxxxxxxxxxx>
    Link: https://lore.kernel.org/xdp-newbies/CAAi1gX7owA+Tcxq-titC-h-KPM7Ri-6ZhTNMhrnPq5gmYYwKow@xxxxxxxxxxxxxx/T/#u
    Link: https://lore.kernel.org/bpf/20231130120353.3084-1-jeroen.vaningenschenau@xxxxxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c b/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
index 736686e903f6..26bfbc73d129 100644
--- a/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
+++ b/tools/testing/selftests/bpf/progs/xdp_synproxy_kern.c
@@ -447,13 +447,13 @@ static __always_inline int tcp_lookup(void *ctx, struct header_pointers *hdr, bo
 		unsigned long status = ct->status;
 
 		bpf_ct_release(ct);
-		if (status & IPS_CONFIRMED_BIT)
+		if (status & IPS_CONFIRMED)
 			return XDP_PASS;
 	} else if (ct_lookup_opts.error != -ENOENT) {
 		return XDP_ABORTED;
 	}
 
-	/* error == -ENOENT || !(status & IPS_CONFIRMED_BIT) */
+	/* error == -ENOENT || !(status & IPS_CONFIRMED) */
 	return XDP_TX;
 }