69 lines
2.5 KiB
Diff
69 lines
2.5 KiB
Diff
From 3dea5920365d06a5f17e33b02f0c3d5e272e09f9 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Borkmann <daniel@iogearbox.net>
|
|
Date: Tue, 12 Dec 2017 02:25:31 +0100
|
|
Subject: [PATCH 124/241] bpf: fix build issues on um due to mising
|
|
bpf_perf_event.h
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
CVE-2017-5754
|
|
|
|
[ Note, this is a Git cherry-pick of the following commit:
|
|
|
|
a23f06f06dbe ("bpf: fix build issues on um due to mising bpf_perf_event.h")
|
|
|
|
... for easier x86 PTI code testing and back-porting. ]
|
|
|
|
Since c895f6f703ad ("bpf: correct broken uapi for
|
|
BPF_PROG_TYPE_PERF_EVENT program type") um (uml) won't build
|
|
on i386 or x86_64:
|
|
|
|
[...]
|
|
CC init/main.o
|
|
In file included from ../include/linux/perf_event.h:18:0,
|
|
from ../include/linux/trace_events.h:10,
|
|
from ../include/trace/syscall.h:7,
|
|
from ../include/linux/syscalls.h:82,
|
|
from ../init/main.c:20:
|
|
../include/uapi/linux/bpf_perf_event.h:11:32: fatal error:
|
|
asm/bpf_perf_event.h: No such file or directory #include
|
|
<asm/bpf_perf_event.h>
|
|
[...]
|
|
|
|
Lets add missing bpf_perf_event.h also to um arch. This seems
|
|
to be the only one still missing.
|
|
|
|
Fixes: c895f6f703ad ("bpf: correct broken uapi for BPF_PROG_TYPE_PERF_EVENT program type")
|
|
Reported-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Suggested-by: Richard Weinberger <richard@sigma-star.at>
|
|
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
|
|
Tested-by: Randy Dunlap <rdunlap@infradead.org>
|
|
Cc: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
|
|
Cc: Richard Weinberger <richard@sigma-star.at>
|
|
Acked-by: Alexei Starovoitov <ast@kernel.org>
|
|
Acked-by: Richard Weinberger <richard@nod.at>
|
|
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
|
|
Signed-off-by: Ingo Molnar <mingo@kernel.org>
|
|
(cherry picked from commit ab95477e7cb35557ecfc837687007b646bab9a9f)
|
|
Signed-off-by: Andy Whitcroft <apw@canonical.com>
|
|
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
|
|
(cherry picked from commit 1883b099261ebece3016b50fa403ffde90027a04)
|
|
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
|
|
---
|
|
arch/um/include/asm/Kbuild | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild
|
|
index 50a32c33d729..73c57f614c9e 100644
|
|
--- a/arch/um/include/asm/Kbuild
|
|
+++ b/arch/um/include/asm/Kbuild
|
|
@@ -1,4 +1,5 @@
|
|
generic-y += barrier.h
|
|
+generic-y += bpf_perf_event.h
|
|
generic-y += bug.h
|
|
generic-y += clkdev.h
|
|
generic-y += current.h
|
|
--
|
|
2.14.2
|
|
|