]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
selftests/bpf: check return value of fopen in test_verifier.c
authorJesper Dangaard Brouer <brouer@redhat.com>
Thu, 17 May 2018 17:39:31 +0000 (19:39 +0200)
committerDaniel Borkmann <daniel@iogearbox.net>
Thu, 17 May 2018 20:18:46 +0000 (22:18 +0200)
Commit 0a6748740368 ("selftests/bpf: Only run tests if !bpf_disabled")
forgot to check return value of fopen.

This caused some confusion, when running test_verifier (from
tools/testing/selftests/bpf/) on an older kernel (< v4.4) as it will
simply seqfault.

This fix avoids the segfault and prints an error, but allow program to
continue.  Given the sysctl was introduced in 1be7f75d1668 ("bpf:
enable non-root eBPF programs"), we know that the running kernel
cannot support unpriv, thus continue with unpriv_disabled = true.

Fixes: 0a6748740368 ("selftests/bpf: Only run tests if !bpf_disabled")
Signed-off-by: Jesper Dangaard Brouer <brouer@redhat.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
tools/testing/selftests/bpf/test_verifier.c

index 3e7718b1a9ae49c176a407d9f14ad31704255701..fd7de7eb329eacc82af76c652d5e3731dc325fe4 100644 (file)
@@ -11713,6 +11713,11 @@ static void get_unpriv_disabled()
        FILE *fd;
 
        fd = fopen("/proc/sys/"UNPRIV_SYSCTL, "r");
+       if (!fd) {
+               perror("fopen /proc/sys/"UNPRIV_SYSCTL);
+               unpriv_disabled = true;
+               return;
+       }
        if (fgets(buf, 2, fd) == buf && atoi(buf))
                unpriv_disabled = true;
        fclose(fd);