| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20240215120233.308986-1-usama.anjum@collabora.com>
Date: Thu, 15 Feb 2024 17:01:42 +0500
From: Muhammad Usama Anjum <usama.anjum@...labora.com>
To: Alexei Starovoitov <ast@...nel.org>,
Daniel Borkmann <daniel@...earbox.net>,
Andrii Nakryiko <andrii@...nel.org>,
Martin KaFai Lau <martin.lau@...ux.dev>,
Eduard Zingerman <eddyz87@...il.com>,
Song Liu <song@...nel.org>,
Yonghong Song <yonghong.song@...ux.dev>,
John Fastabend <john.fastabend@...il.com>,
KP Singh <kpsingh@...nel.org>,
Stanislav Fomichev <sdf@...gle.com>,
Hao Luo <haoluo@...gle.com>,
Jiri Olsa <jolsa@...nel.org>,
Mykola Lysenko <mykolal@...com>,
Shuah Khan <shuah@...nel.org>,
Muhammad Usama Anjum <usama.anjum@...labora.com>
Cc: kernel@...labora.com,
linux-kernel@...r.kernel.org,
bpf@...r.kernel.org,
linux-kselftest@...r.kernel.org
Subject: [PATCH] selftests/bpf: Move test_dev_cgroup to prog_tests
Move test_dev_cgroup to prog_tests to be able to run it with test_progs.
Replace dev_cgroup.bpf.o with skel header file, dev_cgroup.skel.h and
load program from it accourdingly.
./test_progs -t test_dev_cgroup
mknod: /tmp/test_dev_cgroup_null: Operation not permitted
64+0 records in
64+0 records out
32768 bytes (33 kB, 32 KiB) copied, 0.000856684 s, 38.2 MB/s
dd: failed to open '/dev/full': Operation not permitted
dd: failed to open '/dev/random': Operation not permitted
#365 test_dev_cgroup:OK
Summary: 1/0 PASSED, 0 SKIPPED, 0 FAILED
Signed-off-by: Muhammad Usama Anjum <usama.anjum@...labora.com>
---
While converting from skeleton APIs, I didn't found direct alternative
of bpf_prog_attach(fd, cgroup_fd, BPF_CGROUP_DEVICE). So I've kept
using the bpf_prog_attach() in this patch.
---
.../bpf/prog_tests/test_dev_cgroup.c | 67 +++++++++++++++
tools/testing/selftests/bpf/test_dev_cgroup.c | 85 -------------------
2 files changed, 67 insertions(+), 85 deletions(-)
create mode 100644 tools/testing/selftests/bpf/prog_tests/test_dev_cgroup.c
delete mode 100644 tools/testing/selftests/bpf/test_dev_cgroup.c
diff --git a/tools/testing/selftests/bpf/prog_tests/test_dev_cgroup.c b/tools/testing/selftests/bpf/prog_tests/test_dev_cgroup.c
new file mode 100644
index 0000000000000..ee37ce52dec9f
--- /dev/null
+++ b/tools/testing/selftests/bpf/prog_tests/test_dev_cgroup.c
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) 2017 Facebook
+ */
+
+#include <test_progs.h>
+#include <time.h>
+#include "cgroup_helpers.h"
+#include "dev_cgroup.skel.h"
+
+#define TEST_CGROUP "/test-bpf-based-device-cgroup/"
+
+void test_test_dev_cgroup(void)
+{
+ int cgroup_fd, err, duration = 0;
+ struct dev_cgroup *skel;
+ __u32 prog_cnt;
+
+ skel = dev_cgroup__open_and_load();
+ if (CHECK(!skel, "skel_open_and_load", "failed\n"))
+ goto cleanup;
+
+ cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
+ if (CHECK(cgroup_fd < 0, "cgroup_setup_and_join", "failed: %d\n", cgroup_fd))
+ goto cleanup;
+
+ err = bpf_prog_attach(bpf_program__fd(skel->progs.bpf_prog1), cgroup_fd,
+ BPF_CGROUP_DEVICE, 0);
+ if (CHECK(err, "bpf_attach", "failed: %d\n", err))
+ goto cleanup;
+
+ err = bpf_prog_query(cgroup_fd, BPF_CGROUP_DEVICE, 0, NULL, NULL, &prog_cnt);
+ if (CHECK(err || prog_cnt != 1, "bpf_query", "failed: %d %d\n", err, prog_cnt))
+ goto cleanup;
+
+ /* All operations with /dev/zero and /dev/urandom are allowed,
+ * everything else is forbidden.
+ */
+ CHECK(system("rm -f /tmp/test_dev_cgroup_null"), "rm",
+ "unexpected rm on _null\n");
+ CHECK(!system("mknod /tmp/test_dev_cgroup_null c 1 3"),
+ "mknod", "unexpected mknod on _null\n");
+ CHECK(system("rm -f /tmp/test_dev_cgroup_null"), "rm",
+ "unexpected rm on _null\n");
+
+ /* /dev/zero is whitelisted */
+ CHECK(system("rm -f /tmp/test_dev_cgroup_zero"), "rm",
+ "unexpected rm on _zero\n");
+ CHECK(system("mknod /tmp/test_dev_cgroup_zero c 1 5"),
+ "mknod", "unexpected mknod on _zero\n");
+ CHECK(system("rm -f /tmp/test_dev_cgroup_zero"), "rm",
+ "unexpected rm on _zero\n");
+
+ CHECK(system("dd if=/dev/urandom of=/dev/zero count=64"), "dd",
+ "unexpected dd on /dev/zero\n");
+
+ /* src is allowed, target is forbidden */
+ CHECK(!system("dd if=/dev/urandom of=/dev/full count=64"), "dd",
+ "unexpected dd on /dev/full\n");
+
+ /* src is forbidden, target is allowed */
+ CHECK(!system("dd if=/dev/random of=/dev/zero count=64"), "dd",
+ "unexpected dd on /dev/zero\n");
+
+cleanup:
+ cleanup_cgroup_environment();
+ dev_cgroup__destroy(skel);
+}
diff --git a/tools/testing/selftests/bpf/test_dev_cgroup.c b/tools/testing/selftests/bpf/test_dev_cgroup.c
deleted file mode 100644
index adeaf63cb6fa3..0000000000000
--- a/tools/testing/selftests/bpf/test_dev_cgroup.c
+++ /dev/null
@@ -1,85 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2017 Facebook
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include <assert.h>
-#include <sys/time.h>
-
-#include <linux/bpf.h>
-#include <bpf/bpf.h>
-#include <bpf/libbpf.h>
-
-#include "cgroup_helpers.h"
-#include "testing_helpers.h"
-
-#define DEV_CGROUP_PROG "./dev_cgroup.bpf.o"
-
-#define TEST_CGROUP "/test-bpf-based-device-cgroup/"
-
-int main(int argc, char **argv)
-{
- struct bpf_object *obj;
- int error = EXIT_FAILURE;
- int prog_fd, cgroup_fd;
- __u32 prog_cnt;
-
- /* Use libbpf 1.0 API mode */
- libbpf_set_strict_mode(LIBBPF_STRICT_ALL);
-
- if (bpf_prog_test_load(DEV_CGROUP_PROG, BPF_PROG_TYPE_CGROUP_DEVICE,
- &obj, &prog_fd)) {
- printf("Failed to load DEV_CGROUP program\n");
- goto out;
- }
-
- cgroup_fd = cgroup_setup_and_join(TEST_CGROUP);
- if (cgroup_fd < 0) {
- printf("Failed to create test cgroup\n");
- goto out;
- }
-
- /* Attach bpf program */
- if (bpf_prog_attach(prog_fd, cgroup_fd, BPF_CGROUP_DEVICE, 0)) {
- printf("Failed to attach DEV_CGROUP program");
- goto err;
- }
-
- if (bpf_prog_query(cgroup_fd, BPF_CGROUP_DEVICE, 0, NULL, NULL,
- &prog_cnt)) {
- printf("Failed to query attached programs");
- goto err;
- }
-
- /* All operations with /dev/zero and and /dev/urandom are allowed,
- * everything else is forbidden.
- */
- assert(system("rm -f /tmp/test_dev_cgroup_null") == 0);
- assert(system("mknod /tmp/test_dev_cgroup_null c 1 3"));
- assert(system("rm -f /tmp/test_dev_cgroup_null") == 0);
-
- /* /dev/zero is whitelisted */
- assert(system("rm -f /tmp/test_dev_cgroup_zero") == 0);
- assert(system("mknod /tmp/test_dev_cgroup_zero c 1 5") == 0);
- assert(system("rm -f /tmp/test_dev_cgroup_zero") == 0);
-
- assert(system("dd if=/dev/urandom of=/dev/zero count=64") == 0);
-
- /* src is allowed, target is forbidden */
- assert(system("dd if=/dev/urandom of=/dev/full count=64"));
-
- /* src is forbidden, target is allowed */
- assert(system("dd if=/dev/random of=/dev/zero count=64"));
-
- error = 0;
- printf("test_dev_cgroup:PASS\n");
-
-err:
- cleanup_cgroup_environment();
-
-out:
- return error;
-}
--
2.42.0
Powered by blists - more mailing lists