diff options
author | Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2021-07-27 11:25:08 +0300 |
commit | 353b7a55dcaf5fb8758e09ebe2ddf5f3adbac7c5 (patch) | |
tree | 081200957b3d8925cbe913020d45a4e3ba61a7a3 /tools/testing/selftests/bpf/prog_tests/obj_name.c | |
parent | 3ff340e24c9dd5cff9fc07d67914c5adf67f80d6 (diff) | |
parent | c68ef4ad180e09805fa46965d15e1dfadf09ffa5 (diff) |
Merge branch 'fixes-v5.14' into fixes
Diffstat (limited to 'tools/testing/selftests/bpf/prog_tests/obj_name.c')
-rw-r--r-- | tools/testing/selftests/bpf/prog_tests/obj_name.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/obj_name.c b/tools/testing/selftests/bpf/prog_tests/obj_name.c index e178416bddad..6194b776a28b 100644 --- a/tools/testing/selftests/bpf/prog_tests/obj_name.c +++ b/tools/testing/selftests/bpf/prog_tests/obj_name.c @@ -38,13 +38,13 @@ void test_obj_name(void) fd = syscall(__NR_bpf, BPF_PROG_LOAD, &attr, sizeof(attr)); CHECK((tests[i].success && fd < 0) || - (!tests[i].success && fd != -1) || + (!tests[i].success && fd >= 0) || (!tests[i].success && errno != tests[i].expected_errno), "check-bpf-prog-name", "fd %d(%d) errno %d(%d)\n", fd, tests[i].success, errno, tests[i].expected_errno); - if (fd != -1) + if (fd >= 0) close(fd); /* test different attr.map_name during BPF_MAP_CREATE */ @@ -59,13 +59,13 @@ void test_obj_name(void) memcpy(attr.map_name, tests[i].name, ncopy); fd = syscall(__NR_bpf, BPF_MAP_CREATE, &attr, sizeof(attr)); CHECK((tests[i].success && fd < 0) || - (!tests[i].success && fd != -1) || + (!tests[i].success && fd >= 0) || (!tests[i].success && errno != tests[i].expected_errno), "check-bpf-map-name", "fd %d(%d) errno %d(%d)\n", fd, tests[i].success, errno, tests[i].expected_errno); - if (fd != -1) + if (fd >= 0) close(fd); } } |