]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
fix build errors in 4.14 bpf patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jan 2018 17:08:55 +0000 (18:08 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Jan 2018 17:08:55 +0000 (18:08 +0100)
queue-4.14/bpf-prevent-out-of-bounds-speculation.patch

index 6cf6ee0206d42709a62988d9024b8bb24fe7c220..2d674182055f92e30a999d5529cf815906823c97 100644 (file)
@@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return err;
 +      if (func_id == BPF_FUNC_tail_call) {
 +              if (meta.map_ptr == NULL) {
-+                      verbose(env, "verifier bug\n");
++                      verbose("verifier bug\n");
 +                      return -EINVAL;
 +              }
 +              env->insn_aux_data[insn_idx].map_ptr = meta.map_ptr;
@@ -239,7 +239,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +                       */
 +                      map_ptr = env->insn_aux_data[i + delta].map_ptr;
 +                      if (map_ptr == BPF_MAP_PTR_POISON) {
-+                              verbose(env, "tail_call obusing map_ptr\n");
++                              verbose("tail_call obusing map_ptr\n");
 +                              return -EINVAL;
 +                      }
 +                      if (!map_ptr->unpriv_array)