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