diff options
| author | David S. Miller <davem@davemloft.net> | 2023-09-20 11:56:27 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2023-09-20 11:56:27 +0100 |
| commit | b3af9c0e89ca721dfed95401c88c8c6e8067b558 (patch) | |
| tree | b51037cd91090fe0e916ae398a535d18b0159eeb /tools | |
| parent | 6c0da8406382d39ec06ad54b0d4935bd7d63612c (diff) | |
| parent | aec42f36237b09e42eac39f6c74305aec02b4694 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
bpf-next 2023-09-19
The following pull-request contains BPF updates for your *net-next* tree.
We've added 4 non-merge commits during the last 1 day(s) which contain
a total of 4 files changed, 9 insertions(+), 13 deletions(-).
The main changes are:
1) A set of fixes for bpf exceptions, from Kumar and Alexei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/bpf/prog_tests/exceptions.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/prog_tests/exceptions.c b/tools/testing/selftests/bpf/prog_tests/exceptions.c index 5663e427dc00..516f4a13013c 100644 --- a/tools/testing/selftests/bpf/prog_tests/exceptions.c +++ b/tools/testing/selftests/bpf/prog_tests/exceptions.c @@ -103,9 +103,10 @@ static void test_exceptions_success(void) goto done; \ } \ if (load_ret != 0) { \ - printf("%s\n", log_buf); \ - if (!ASSERT_OK_PTR(strstr(log_buf, msg), "strstr")) \ + if (!ASSERT_OK_PTR(strstr(log_buf, msg), "strstr")) { \ + printf("%s\n", log_buf); \ goto done; \ + } \ } \ if (!load_ret && attach_err) { \ if (!ASSERT_ERR_PTR(link = bpf_program__attach(prog), "attach err")) \ |