]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2020 15:53:03 +0000 (17:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 18 May 2020 15:53:03 +0000 (17:53 +0200)
queue-5.6/bpf-enforce-returning-0-for-fentry-fexit-progs.patch

index d7a4f86c2cad74726782ecbff8cf75a47723660d..870875579d3552866ce0866530bf54d7128647aa 100644 (file)
@@ -32,12 +32,12 @@ Link: https://lore.kernel.org/bpf/20200514053206.1298415-1-yhs@fb.com
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- kernel/bpf/verifier.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
+ kernel/bpf/verifier.c |   1++++++++++++++++
+ 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 <gregkh@linuxfoundation.org>
 +                      range = tnum_const(0);
 +                      break;
 +              case BPF_TRACE_RAW_TP:
-+              case BPF_MODIFY_RETURN:
 +                      return 0;
 +              default:
 +                      return -ENOTSUPP;