From c6f78a1e43df8ea79b378ac968f581d35e3e5ea3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 18 May 2020 17:53:03 +0200 Subject: [PATCH] fix queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch --- .../bpf-enforce-returning-0-for-fentry-fexit-progs.patch | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch b/queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch index d7a4f86c2ca..870875579d3 100644 --- a/queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch +++ b/queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch @@ -32,12 +32,12 @@ Link: https://lore.kernel.org/bpf/20200514053206.1298415-1-yhs@fb.com Signed-off-by: Greg Kroah-Hartman --- - kernel/bpf/verifier.c | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) + kernel/bpf/verifier.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c -@@ -6498,6 +6498,23 @@ static int check_return_code(struct bpf_ +@@ -6498,6 +6498,22 @@ static int check_return_code(struct bpf_ return 0; range = tnum_const(0); break; @@ -48,7 +48,6 @@ Signed-off-by: Greg Kroah-Hartman + range = tnum_const(0); + break; + case BPF_TRACE_RAW_TP: -+ case BPF_MODIFY_RETURN: + return 0; + default: + return -ENOTSUPP; -- 2.47.3