selftests/bpf: Avoid running unprivileged tests with alignment requirements
authorBjörn Töpel <bjorn.topel@gmail.com>
Wed, 18 Nov 2020 07:16:39 +0000 (08:16 +0100)
committerAndrii Nakryiko <andrii@kernel.org>
Thu, 19 Nov 2020 01:45:31 +0000 (17:45 -0800)
Some architectures have strict alignment requirements. In that case,
the BPF verifier detects if a program has unaligned accesses and
rejects them. A user can pass BPF_F_ANY_ALIGNMENT to a program to
override this check. That, however, will only work when a privileged
user loads a program. An unprivileged user loading a program with this
flag will be rejected prior entering the verifier.

Hence, it does not make sense to load unprivileged programs without
strict alignment when testing the verifier. This patch avoids exactly
that.

Signed-off-by: Björn Töpel <bjorn.topel@gmail.com>
Signed-off-by: Andrii Nakryiko <andrii@kernel.org>
Acked-by: Luke Nelson <luke.r.nels@gmail.com>
Link: https://lore.kernel.org/bpf/20201118071640.83773-3-bjorn.topel@gmail.com
tools/testing/selftests/bpf/test_verifier.c

index 9be395d9dc648e65e4d3f3d05c7d10fcb17992b3..4bfe3aa2cfc4d6185d87d35b3707719f7eac55d3 100644 (file)
@@ -1152,6 +1152,19 @@ static void get_unpriv_disabled()
 
 static bool test_as_unpriv(struct bpf_test *test)
 {
+#ifndef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS
+       /* Some architectures have strict alignment requirements. In
+        * that case, the BPF verifier detects if a program has
+        * unaligned accesses and rejects them. A user can pass
+        * BPF_F_ANY_ALIGNMENT to a program to override this
+        * check. That, however, will only work when a privileged user
+        * loads a program. An unprivileged user loading a program
+        * with this flag will be rejected prior entering the
+        * verifier.
+        */
+       if (test->flags & F_NEEDS_EFFICIENT_UNALIGNED_ACCESS)
+               return false;
+#endif
        return !test->prog_type ||
               test->prog_type == BPF_PROG_TYPE_SOCKET_FILTER ||
               test->prog_type == BPF_PROG_TYPE_CGROUP_SKB;