bpf: sockmap, test for unconnected af_unix sock

Add test to sockmap_basic to ensure af_unix sockets that are not connected
can not be added to the map. Ensure we keep DGRAM sockets working however
as these will not be connected typically.

Signed-off-by: John Fastabend <john.fastabend@gmail.com>
Acked-by: Jakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/r/20231201180139.328529-3-john.fastabend@gmail.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

diff --git a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
index f75f84d0b3d79807533f381a72975c5f9dd1c9a9..7c2241fae19a6e0cebbbb301b6bab91396f2bb47 100644 (file)
--- a/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
+++ b/tools/testing/selftests/bpf/prog_tests/sockmap_basic.c
@@ -524,6 +524,37 @@ out:
        test_sockmap_pass_prog__destroy(pass);
 }
 
+static void test_sockmap_unconnected_unix(void)
+{
+       int err, map, stream = 0, dgram = 0, zero = 0;
+       struct test_sockmap_pass_prog *skel;
+
+       skel = test_sockmap_pass_prog__open_and_load();
+       if (!ASSERT_OK_PTR(skel, "open_and_load"))
+               return;
+
+       map = bpf_map__fd(skel->maps.sock_map_rx);
+
+       stream = xsocket(AF_UNIX, SOCK_STREAM, 0);
+       if (stream < 0)
+               return;
+
+       dgram = xsocket(AF_UNIX, SOCK_DGRAM, 0);
+       if (dgram < 0) {
+               close(stream);
+               return;
+       }
+
+       err = bpf_map_update_elem(map, &zero, &stream, BPF_ANY);
+       ASSERT_ERR(err, "bpf_map_update_elem(stream)");
+
+       err = bpf_map_update_elem(map, &zero, &dgram, BPF_ANY);
+       ASSERT_OK(err, "bpf_map_update_elem(dgram)");
+
+       close(stream);
+       close(dgram);
+}
+
 void test_sockmap_basic(void)
 {
        if (test__start_subtest("sockmap create_update_free"))
@@ -566,4 +597,7 @@ void test_sockmap_basic(void)
                test_sockmap_skb_verdict_fionread(false);
        if (test__start_subtest("sockmap skb_verdict msg_f_peek"))
                test_sockmap_skb_verdict_peek();
+
+       if (test__start_subtest("sockmap unconnected af_unix"))
+               test_sockmap_unconnected_unix();
 }