2fb44600fe
Commit0a98764567("um: Allow building and running on older hosts") attempted to check for PTRACE_{GET,SET}REGSET under the premise that these ptrace(2) parameters were directly linked with the presence of the _xstate structure. After Richard's commit61e8d46245("um: Correctly check for PTRACE_GETRESET/SETREGSET") which properly included linux/ptrace.h instead of asm/ptrace.h, we could get into the original build failure that I reported: arch/x86/um/user-offsets.c: In function 'foo': arch/x86/um/user-offsets.c:54: error: invalid application of 'sizeof' to incomplete type 'struct _xstate' On this particular host, we do have PTRACE_GETREGSET and PTRACE_SETREGSET defined in linux/ptrace.h, but not the structure _xstate that should be pulled from the following include chain: signal.h -> bits/sigcontext.h. Correctly fix this by checking for FP_XSTATE_MAGIC1 which is the correct way to see if struct _xstate is available or not on the host. Fixes:61e8d46245("um: Correctly check for PTRACE_GETRESET/SETREGSET") Fixes:0a98764567("um: Allow building and running on older hosts") Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at>
100 lines
2.4 KiB
C
100 lines
2.4 KiB
C
#include <stdio.h>
|
|
#include <stddef.h>
|
|
#include <signal.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/user.h>
|
|
#define __FRAME_OFFSETS
|
|
#include <linux/ptrace.h>
|
|
#include <asm/types.h>
|
|
|
|
#ifdef __i386__
|
|
#define __SYSCALL_I386(nr, sym, qual) [nr] = 1,
|
|
static char syscalls[] = {
|
|
#include <asm/syscalls_32.h>
|
|
};
|
|
#else
|
|
#define __SYSCALL_64(nr, sym, qual) [nr] = 1,
|
|
static char syscalls[] = {
|
|
#include <asm/syscalls_64.h>
|
|
};
|
|
#endif
|
|
|
|
#define DEFINE(sym, val) \
|
|
asm volatile("\n->" #sym " %0 " #val : : "i" (val))
|
|
|
|
#define DEFINE_LONGS(sym, val) \
|
|
asm volatile("\n->" #sym " %0 " #val : : "i" (val/sizeof(unsigned long)))
|
|
|
|
void foo(void)
|
|
{
|
|
#ifdef __i386__
|
|
DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));
|
|
DEFINE_LONGS(HOST_FPX_SIZE, sizeof(struct user_fpxregs_struct));
|
|
|
|
DEFINE(HOST_IP, EIP);
|
|
DEFINE(HOST_SP, UESP);
|
|
DEFINE(HOST_EFLAGS, EFL);
|
|
DEFINE(HOST_AX, EAX);
|
|
DEFINE(HOST_BX, EBX);
|
|
DEFINE(HOST_CX, ECX);
|
|
DEFINE(HOST_DX, EDX);
|
|
DEFINE(HOST_SI, ESI);
|
|
DEFINE(HOST_DI, EDI);
|
|
DEFINE(HOST_BP, EBP);
|
|
DEFINE(HOST_CS, CS);
|
|
DEFINE(HOST_SS, SS);
|
|
DEFINE(HOST_DS, DS);
|
|
DEFINE(HOST_FS, FS);
|
|
DEFINE(HOST_ES, ES);
|
|
DEFINE(HOST_GS, GS);
|
|
DEFINE(HOST_ORIG_AX, ORIG_EAX);
|
|
#else
|
|
#ifdef FP_XSTATE_MAGIC1
|
|
DEFINE(HOST_FP_SIZE, sizeof(struct _xstate) / sizeof(unsigned long));
|
|
#else
|
|
DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long));
|
|
#endif
|
|
DEFINE_LONGS(HOST_BX, RBX);
|
|
DEFINE_LONGS(HOST_CX, RCX);
|
|
DEFINE_LONGS(HOST_DI, RDI);
|
|
DEFINE_LONGS(HOST_SI, RSI);
|
|
DEFINE_LONGS(HOST_DX, RDX);
|
|
DEFINE_LONGS(HOST_BP, RBP);
|
|
DEFINE_LONGS(HOST_AX, RAX);
|
|
DEFINE_LONGS(HOST_R8, R8);
|
|
DEFINE_LONGS(HOST_R9, R9);
|
|
DEFINE_LONGS(HOST_R10, R10);
|
|
DEFINE_LONGS(HOST_R11, R11);
|
|
DEFINE_LONGS(HOST_R12, R12);
|
|
DEFINE_LONGS(HOST_R13, R13);
|
|
DEFINE_LONGS(HOST_R14, R14);
|
|
DEFINE_LONGS(HOST_R15, R15);
|
|
DEFINE_LONGS(HOST_ORIG_AX, ORIG_RAX);
|
|
DEFINE_LONGS(HOST_CS, CS);
|
|
DEFINE_LONGS(HOST_SS, SS);
|
|
DEFINE_LONGS(HOST_EFLAGS, EFLAGS);
|
|
#if 0
|
|
DEFINE_LONGS(HOST_FS, FS);
|
|
DEFINE_LONGS(HOST_GS, GS);
|
|
DEFINE_LONGS(HOST_DS, DS);
|
|
DEFINE_LONGS(HOST_ES, ES);
|
|
#endif
|
|
|
|
DEFINE_LONGS(HOST_IP, RIP);
|
|
DEFINE_LONGS(HOST_SP, RSP);
|
|
#endif
|
|
|
|
DEFINE(UM_FRAME_SIZE, sizeof(struct user_regs_struct));
|
|
DEFINE(UM_POLLIN, POLLIN);
|
|
DEFINE(UM_POLLPRI, POLLPRI);
|
|
DEFINE(UM_POLLOUT, POLLOUT);
|
|
|
|
DEFINE(UM_PROT_READ, PROT_READ);
|
|
DEFINE(UM_PROT_WRITE, PROT_WRITE);
|
|
DEFINE(UM_PROT_EXEC, PROT_EXEC);
|
|
|
|
DEFINE(__NR_syscall_max, sizeof(syscalls) - 1);
|
|
DEFINE(NR_syscalls, sizeof(syscalls));
|
|
}
|