Commit ea352712 authored by Anisse Astier's avatar Anisse Astier Committed by Greg Kroah-Hartman

arm64/sve: <uapi/asm/ptrace.h> should not depend on <uapi/linux/prctl.h>

commit 35341ca0 upstream.

Pulling linux/prctl.h into asm/ptrace.h in the arm64 UAPI headers causes
userspace build issues for any program (e.g. strace and qemu) that
includes both <sys/prctl.h> and <linux/ptrace.h> when using musl libc:

  | error: redefinition of 'struct prctl_mm_map'
  |  struct prctl_mm_map {

See https://github.com/foundriesio/meta-lmp/commit/6d4a106e191b5d79c41b9ac78fd321316d3013c0
for a public example of people working around this issue.

Although it's a bit grotty, fix this breakage by duplicating the prctl
constant definitions. Since these are part of the kernel ABI, they
cannot be changed in future and so it's not the end of the world to have
them open-coded.

Fixes: 43d4da2c ("arm64/sve: ptrace and ELF coredump support")
Cc: stable@vger.kernel.org
Acked-by: default avatarDave Martin <Dave.Martin@arm.com>
Signed-off-by: default avatarAnisse Astier <aastier@freebox.fr>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e5675972
...@@ -65,8 +65,6 @@ ...@@ -65,8 +65,6 @@
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <linux/prctl.h>
/* /*
* User structures for general purpose, floating point and debug registers. * User structures for general purpose, floating point and debug registers.
*/ */
...@@ -113,10 +111,10 @@ struct user_sve_header { ...@@ -113,10 +111,10 @@ struct user_sve_header {
/* /*
* Common SVE_PT_* flags: * Common SVE_PT_* flags:
* These must be kept in sync with prctl interface in <linux/ptrace.h> * These must be kept in sync with prctl interface in <linux/prctl.h>
*/ */
#define SVE_PT_VL_INHERIT (PR_SVE_VL_INHERIT >> 16) #define SVE_PT_VL_INHERIT ((1 << 17) /* PR_SVE_VL_INHERIT */ >> 16)
#define SVE_PT_VL_ONEXEC (PR_SVE_SET_VL_ONEXEC >> 16) #define SVE_PT_VL_ONEXEC ((1 << 18) /* PR_SVE_SET_VL_ONEXEC */ >> 16)
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment