linux-kernel - [PATCH 4.14 070/159] bpf: fix build issues on um due to mising bpf_perf

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <20171222084627.529818305@linuxfoundation.org>
Date:   Fri, 22 Dec 2017 09:45:55 +0100
From:   Greg Kroah-Hartman <gregkh@...uxfoundation.org>
To:     linux-kernel@...r.kernel.org
Cc:     Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
        stable@...r.kernel.org, Randy Dunlap <rdunlap@...radead.org>,
        Richard Weinberger <richard@...ma-star.at>,
        Daniel Borkmann <daniel@...earbox.net>,
        Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>,
        Alexei Starovoitov <ast@...nel.org>,
        Richard Weinberger <richard@....at>,
        Ingo Molnar <mingo@...nel.org>
Subject: [PATCH 4.14 070/159] bpf: fix build issues on um due to mising bpf_perf_event.h

4.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Daniel Borkmann <daniel@...earbox.net>

commit ab95477e7cb35557ecfc837687007b646bab9a9f upstream.

[ 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@...radead.org>
Suggested-by: Richard Weinberger <richard@...ma-star.at>
Signed-off-by: Daniel Borkmann <daniel@...earbox.net>
Tested-by: Randy Dunlap <rdunlap@...radead.org>
Cc: Hendrik Brueckner <brueckner@...ux.vnet.ibm.com>
Cc: Richard Weinberger <richard@...ma-star.at>
Acked-by: Alexei Starovoitov <ast@...nel.org>
Acked-by: Richard Weinberger <richard@....at>
Signed-off-by: Alexei Starovoitov <ast@...nel.org>
Signed-off-by: Ingo Molnar <mingo@...nel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...uxfoundation.org>

---
 arch/um/include/asm/Kbuild |    1 +
 1 file changed, 1 insertion(+)

--- 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