]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
selftests/bpf: Honour the sotype of af_unix redir tests
authorMichal Luczaj <mhal@rbox.co>
Wed, 31 Jul 2024 10:01:29 +0000 (12:01 +0200)
committerMartin KaFai Lau <martin.lau@kernel.org>
Mon, 19 Aug 2024 23:43:40 +0000 (16:43 -0700)
Do actually test the sotype as specified by the caller.

This picks up after commit 75e0e27db6cf ("selftest/bpf: Change udp to inet
in some function names").

Reviewed-by: Jakub Sitnicki <jakub@cloudflare.com>
Tested-by: Jakub Sitnicki <jakub@cloudflare.com>
Suggested-by: Jakub Sitnicki <jakub@cloudflare.com>
Signed-off-by: Michal Luczaj <mhal@rbox.co>
Link: https://lore.kernel.org/r/20240731-selftest-sockmap-fixes-v2-4-08a0c73abed2@rbox.co
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
tools/testing/selftests/bpf/prog_tests/sockmap_listen.c

index ea2faacd146d5f0fad96d154324b3533f11f383c..7ed223df5f12e744f49f48caafcdbd7f0d1611e2 100644 (file)
@@ -1706,11 +1706,11 @@ static void inet_unix_redir_to_connected(int family, int type, int sock_mapfd,
        int sfd[2];
        int err;
 
-       if (socketpair(AF_UNIX, SOCK_DGRAM | SOCK_NONBLOCK, 0, sfd))
+       if (socketpair(AF_UNIX, type | SOCK_NONBLOCK, 0, sfd))
                return;
        c0 = sfd[0], p0 = sfd[1];
 
-       err = inet_socketpair(family, SOCK_DGRAM, &p1, &c1);
+       err = inet_socketpair(family, type, &p1, &c1);
        if (err)
                goto close;
 
@@ -1758,7 +1758,7 @@ static void unix_inet_redir_to_connected(int family, int type, int sock_mapfd,
        int sfd[2];
        int err;
 
-       err = inet_socketpair(family, SOCK_DGRAM, &p0, &c0);
+       err = inet_socketpair(family, type, &p0, &c0);
        if (err)
                return;