Commit 8c0be063 authored by Felix Maurer's avatar Felix Maurer Committed by Andrii Nakryiko

selftests: bpf: Fix bind on used port

The bind_perm BPF selftest failed when port 111/tcp was already in use
during the test. To fix this, the test now runs in its own network name
space.

To use unshare, it is necessary to reorder the includes. The style of
the includes is adapted to be consistent with the other prog_tests.

v2: Replace deprecated CHECK macro with ASSERT_OK

Fixes: 8259fdeb ("selftests/bpf: Verify that rebinding to port < 1024 from BPF works")
Signed-off-by: default avatarFelix Maurer <fmaurer@redhat.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Reviewed-by: default avatarJakub Sitnicki <jakub@cloudflare.com>
Link: https://lore.kernel.org/bpf/551ee65533bb987a43f93d88eaf2368b416ccd32.1642518457.git.fmaurer@redhat.com
parent 38f033a1
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include <test_progs.h> #define _GNU_SOURCE
#include "bind_perm.skel.h" #include <sched.h>
#include <stdlib.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/capability.h> #include <sys/capability.h>
#include "test_progs.h"
#include "bind_perm.skel.h"
static int duration; static int duration;
static int create_netns(void)
{
if (!ASSERT_OK(unshare(CLONE_NEWNET), "create netns"))
return -1;
return 0;
}
void try_bind(int family, int port, int expected_errno) void try_bind(int family, int port, int expected_errno)
{ {
struct sockaddr_storage addr = {}; struct sockaddr_storage addr = {};
...@@ -75,6 +86,9 @@ void test_bind_perm(void) ...@@ -75,6 +86,9 @@ void test_bind_perm(void)
struct bind_perm *skel; struct bind_perm *skel;
int cgroup_fd; int cgroup_fd;
if (create_netns())
return;
cgroup_fd = test__join_cgroup("/bind_perm"); cgroup_fd = test__join_cgroup("/bind_perm");
if (CHECK(cgroup_fd < 0, "cg-join", "errno %d", errno)) if (CHECK(cgroup_fd < 0, "cg-join", "errno %d", errno))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment