]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
selftests/bpf: Support SOCK_STREAM in unix_inet_redir_to_connected()
authorMichal Luczaj <mhal@rbox.co>
Sat, 13 Jul 2024 19:41:39 +0000 (21:41 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 17 Oct 2024 13:10:35 +0000 (15:10 +0200)
[ Upstream commit 1b0ad43177c097d38b967b99c2b71d8be28b0223 ]

Function ignores the AF_UNIX socket type argument, SOCK_DGRAM is hardcoded.
Fix to respect the argument provided.

Fixes: 75e0e27db6cf ("selftest/bpf: Change udp to inet in some function names")
Suggested-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/20240713200218.2140950-3-mhal@rbox.co
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c

index d88bb65b74cc9cc46c02ab91f8132d4eb9511d57..1a0c678cba90561f2b39d4811a033d7f2a802aa2 100644 (file)
@@ -1911,7 +1911,7 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,
        if (err)
                return;
 
-       if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, sfd))
+       if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))
                goto close_cli0;
        c1 = sfd[0], p1 = sfd[1];
 
@@ -1946,7 +1946,6 @@ close:
 close_cli0:
        xclose(c0);
        xclose(p0);
-
 }
 
 static void unix_inet_skb_redir_to_connected(struct test_sockmap_listen *skel,