patches/kernel/0124-bpf-fix-build-issues-on-um-due-to-mising-bpf_perf_ev.patch

   1 From 3dea5920365d06a5f17e33b02f0c3d5e272e09f9 Mon Sep 17 00:00:00 2001
   2 From: Daniel Borkmann <daniel@iogearbox.net>
   3 Date: Tue, 12 Dec 2017 02:25:31 +0100
   4 Subject: [PATCH 124/233] bpf: fix build issues on um due to mising
   5  bpf_perf_event.h
   6 MIME-Version: 1.0
   7 Content-Type: text/plain; charset=UTF-8
   8 Content-Transfer-Encoding: 8bit
   9
  10 CVE-2017-5754
  11
  12 [ Note, this is a Git cherry-pick of the following commit:
  13
  14     a23f06f06dbe ("bpf: fix build issues on um due to mising bpf_perf_event.h")
  15
  16   ... for easier x86 PTI code testing and back-porting. ]
  17
  18 Since c895f6f703ad ("bpf: correct broken uapi for
  19 BPF_PROG_TYPE_PERF_EVENT program type") um (uml) won't build
  20 on i386 or x86_64:
  21
  22   [...]
  23     CC      init/main.o
  24   In file included from ../include/linux/perf_event.h:18:0,
  25                    from ../include/linux/trace_events.h:10,
  26                    from ../include/trace/syscall.h:7,
  27                    from ../include/linux/syscalls.h:82,
  28                    from ../init/main.c:20:
  29   ../include/uapi/linux/bpf_perf_event.h:11:32: fatal error:
  30   asm/bpf_perf_event.h: No such file or directory #include
  31   <asm/bpf_perf_event.h>
  32   [...]
  33
  34 Lets add missing bpf_perf_event.h also to um arch. This seems
  35 to be the only one still missing.
  36
  37 Fixes: c895f6f703ad ("bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type")
  38 Reported-by: Randy Dunlap <rdunlap@infradead.org>
  39 Suggested-by: Richard Weinberger <richard@sigma-star.at>
  40 Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
  41 Tested-by: Randy Dunlap <rdunlap@infradead.org>
  42 Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
  43 Cc: Richard Weinberger <richard@sigma-star.at>
  44 Acked-by: Alexei Starovoitov <ast@kernel.org>
  45 Acked-by: Richard Weinberger <richard@nod.at>
  46 Signed-off-by: Alexei Starovoitov <ast@kernel.org>
  47 Signed-off-by: Ingo Molnar <mingo@kernel.org>
  48 (cherry picked from commit ab95477e7cb35557ecfc837687007b646bab9a9f)
  49 Signed-off-by: Andy Whitcroft <apw@canonical.com>
  50 Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
  51 (cherry picked from commit 1883b099261ebece3016b50fa403ffde90027a04)
  52 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
  53 ---
  54  arch/um/include/asm/Kbuild | 1 +
  55  1 file changed, 1 insertion(+)
  56
  57 diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
  58 index 50a32c33d729..73c57f614c9e 100644
  59 --- a/arch/um/include/asm/Kbuild
  60 +++ b/arch/um/include/asm/Kbuild
  61 @@ -1,4 +1,5 @@
  62  generic-y += barrier.h
  63 +generic-y += bpf_perf_event.h
  64  generic-y += bug.h
  65  generic-y += clkdev.h
  66  generic-y += current.h
  67 --
  68 2.14.2
  69