kernel/x86_64: add setup_compat_signal_frame.
* add compatibility signal types. Change-Id: I665020234be0ba2ccbb33bdbc338c11a214ab6e8
This commit is contained in:
Jérôme Duval
@@ -31,6 +31,12 @@ bool arch_on_signal_stack(Thread *thread);
|
||||
status_t arch_setup_signal_frame(Thread *thread, struct sigaction *action,
|
||||
struct signal_frame_data *signalFrameData);
|
||||
int64 arch_restore_signal_frame(struct signal_frame_data* signalFrameData);
|
||||
#ifdef _COMPAT_MODE
|
||||
status_t arch_setup_compat_signal_frame(Thread *thread,
|
||||
struct sigaction *action, struct compat_signal_frame_data *signalFrameData);
|
||||
int64 arch_restore_compat_signal_frame(
|
||||
struct compat_signal_frame_data* signalFrameData);
|
||||
#endif
|
||||
|
||||
void arch_store_fork_frame(struct arch_fork_arg *arg);
|
||||
void arch_restore_fork_frame(struct arch_fork_arg *arg);
|
||||
|
||||
@@ -51,6 +51,30 @@ arch_thread_set_current_thread(Thread* t)
|
||||
}
|
||||
|
||||
|
||||
#ifdef _COMPAT_MODE
|
||||
|
||||
|
||||
static inline void
|
||||
arch_thread_set_ds(unsigned short ds)
|
||||
{
|
||||
asm volatile("mov %0, %%ds" : : "r" (ds) : "memory");
|
||||
}
|
||||
|
||||
|
||||
static inline void
|
||||
arch_thread_set_es(unsigned short es)
|
||||
{
|
||||
asm volatile("mov %0, %%es" : : "r" (es) : "memory");
|
||||
}
|
||||
|
||||
// override empty macro
|
||||
#undef arch_syscall_64_bit_return_value
|
||||
void arch_syscall_64_bit_return_value(void);
|
||||
|
||||
|
||||
#endif // _COMPAT_MODE
|
||||
|
||||
|
||||
#else // __x86_64__
|
||||
|
||||
|
||||
|
||||
@@ -0,0 +1,113 @@
|
||||
/*
|
||||
* Copyright 2018, Haiku Inc. All rights reserved.
|
||||
*
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _KERNEL_COMPAT_ARCH_SIGNAL_H
|
||||
#define _KERNEL_COMPAT_ARCH_SIGNAL_H
|
||||
|
||||
|
||||
typedef struct packed_fp_stack {
|
||||
unsigned char st0[10];
|
||||
unsigned char st1[10];
|
||||
unsigned char st2[10];
|
||||
unsigned char st3[10];
|
||||
unsigned char st4[10];
|
||||
unsigned char st5[10];
|
||||
unsigned char st6[10];
|
||||
unsigned char st7[10];
|
||||
} packed_fp_stack;
|
||||
|
||||
typedef struct packed_mmx_regs {
|
||||
unsigned char mm0[10];
|
||||
unsigned char mm1[10];
|
||||
unsigned char mm2[10];
|
||||
unsigned char mm3[10];
|
||||
unsigned char mm4[10];
|
||||
unsigned char mm5[10];
|
||||
unsigned char mm6[10];
|
||||
unsigned char mm7[10];
|
||||
} packed_mmx_regs;
|
||||
|
||||
typedef struct xmmx_regs {
|
||||
unsigned char xmm0[16];
|
||||
unsigned char xmm1[16];
|
||||
unsigned char xmm2[16];
|
||||
unsigned char xmm3[16];
|
||||
unsigned char xmm4[16];
|
||||
unsigned char xmm5[16];
|
||||
unsigned char xmm6[16];
|
||||
unsigned char xmm7[16];
|
||||
} xmmx_regs;
|
||||
|
||||
typedef struct compat_stack_t {
|
||||
uint32 ss_sp;
|
||||
uint32 ss_size;
|
||||
int ss_flags;
|
||||
} compat_stack_t;
|
||||
|
||||
typedef struct compat_old_extended_regs {
|
||||
unsigned short fp_control;
|
||||
unsigned short _reserved1;
|
||||
unsigned short fp_status;
|
||||
unsigned short _reserved2;
|
||||
unsigned short fp_tag;
|
||||
unsigned short _reserved3;
|
||||
uint32 fp_eip;
|
||||
unsigned short fp_cs;
|
||||
unsigned short fp_opcode;
|
||||
uint32 fp_datap;
|
||||
unsigned short fp_ds;
|
||||
unsigned short _reserved4;
|
||||
union {
|
||||
packed_fp_stack fp;
|
||||
packed_mmx_regs mmx;
|
||||
} fp_mmx;
|
||||
} compat_old_extended_regs;
|
||||
|
||||
typedef struct compat_new_extended_regs {
|
||||
unsigned short fp_control;
|
||||
unsigned short fp_status;
|
||||
unsigned short fp_tag;
|
||||
unsigned short fp_opcode;
|
||||
uint32 fp_eip;
|
||||
unsigned short fp_cs;
|
||||
unsigned short res_14_15;
|
||||
uint32 fp_datap;
|
||||
unsigned short fp_ds;
|
||||
unsigned short _reserved_22_23;
|
||||
uint32 mxcsr;
|
||||
uint32 _reserved_28_31;
|
||||
union {
|
||||
fp_stack fp;
|
||||
mmx_regs mmx;
|
||||
} fp_mmx;
|
||||
xmmx_regs xmmx;
|
||||
unsigned char _reserved_288_511[224];
|
||||
} compat_new_extended_regs;
|
||||
|
||||
typedef struct compat_extended_regs {
|
||||
union {
|
||||
compat_old_extended_regs old_format;
|
||||
compat_new_extended_regs new_format;
|
||||
} state;
|
||||
uint32 format;
|
||||
} compat_extended_regs;
|
||||
|
||||
struct compat_vregs {
|
||||
uint32 eip;
|
||||
uint32 eflags;
|
||||
uint32 eax;
|
||||
uint32 ecx;
|
||||
uint32 edx;
|
||||
uint32 esp;
|
||||
uint32 ebp;
|
||||
uint32 _reserved_1;
|
||||
compat_extended_regs xregs;
|
||||
uint32 edi;
|
||||
uint32 esi;
|
||||
uint32 ebx;
|
||||
};
|
||||
|
||||
|
||||
#endif // _KERNEL_COMPAT_ARCH_SIGNAL_H
|
||||
@@ -0,0 +1,164 @@
|
||||
/*
|
||||
* Copyright 2018, Haiku Inc. All rights reserved.
|
||||
*
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _KERNEL_COMPAT_KSIGNAL_H
|
||||
#define _KERNEL_COMPAT_KSIGNAL_H
|
||||
|
||||
|
||||
#include <compat/signal_compat.h>
|
||||
#include <compat/arch/x86/signal_compat.h>
|
||||
|
||||
|
||||
typedef struct compat_vregs compat_mcontext_t;
|
||||
|
||||
typedef struct __compat_ucontext_t {
|
||||
uint32 uc_link;
|
||||
sigset_t uc_sigmask;
|
||||
compat_stack_t uc_stack;
|
||||
compat_mcontext_t uc_mcontext;
|
||||
} _PACKED compat_ucontext_t;
|
||||
|
||||
union compat_sigval {
|
||||
int sival_int;
|
||||
uint32 sival_ptr;
|
||||
};
|
||||
|
||||
|
||||
typedef struct __compat_siginfo_t {
|
||||
int si_signo; /* signal number */
|
||||
int si_code; /* signal code */
|
||||
int si_errno; /* if non zero, an error number associated with
|
||||
this signal */
|
||||
pid_t si_pid; /* sending process ID */
|
||||
uid_t si_uid; /* real user ID of sending process */
|
||||
uint32 si_addr; /* address of faulting instruction */
|
||||
int si_status; /* exit value or signal */
|
||||
uint32 si_band; /* band event for SIGPOLL */
|
||||
union compat_sigval si_value; /* signal value */
|
||||
} compat_siginfo_t;
|
||||
|
||||
struct compat_signal_frame_data {
|
||||
compat_siginfo_t info;
|
||||
compat_ucontext_t context;
|
||||
uint32 user_data;
|
||||
uint32 handler;
|
||||
bool siginfo_handler;
|
||||
char _pad[3];
|
||||
int32 thread_flags;
|
||||
uint64 syscall_restart_return_value;
|
||||
uint8 syscall_restart_parameters[SYSCALL_RESTART_PARAMETER_SIZE];
|
||||
uint32 commpage_address;
|
||||
} _PACKED;
|
||||
|
||||
|
||||
static_assert(sizeof(compat_stack_t) == 12,
|
||||
"size of compat_stack_t mismatch");
|
||||
static_assert(sizeof(compat_mcontext_t) == 560,
|
||||
"size of compat_mcontext_t mismatch");
|
||||
static_assert(sizeof(compat_ucontext_t) == 584,
|
||||
"size of compat_ucontext_t mismatch");
|
||||
static_assert(sizeof(compat_siginfo_t) == 36,
|
||||
"size of compat_siginfo_t mismatch");
|
||||
static_assert(sizeof(struct compat_signal_frame_data) == 680,
|
||||
"size of compat_signal_frame_data mismatch");
|
||||
|
||||
|
||||
inline status_t
|
||||
copy_ref_var_from_user(union sigval* userSigval, union sigval &sigval)
|
||||
{
|
||||
if (!IS_USER_ADDRESS(userSigval))
|
||||
return B_BAD_ADDRESS;
|
||||
Thread* thread = thread_get_current_thread();
|
||||
bool compatMode = (thread->flags & THREAD_FLAGS_COMPAT_MODE) != 0;
|
||||
if (compatMode) {
|
||||
compat_sigval compat_sigval;
|
||||
if (user_memcpy(&compat_sigval, userSigval, sizeof(compat_sigval))
|
||||
< B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
sigval.sival_ptr = (void*)(addr_t)compat_sigval.sival_ptr;
|
||||
} else if (user_memcpy(&sigval, userSigval, sizeof(union sigval)) < B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
inline status_t
|
||||
copy_ref_var_to_user(siginfo_t &info, siginfo_t* userInfo)
|
||||
{
|
||||
if (!IS_USER_ADDRESS(userInfo))
|
||||
return B_BAD_ADDRESS;
|
||||
Thread* thread = thread_get_current_thread();
|
||||
bool compatMode = (thread->flags & THREAD_FLAGS_COMPAT_MODE) != 0;
|
||||
if (compatMode) {
|
||||
compat_siginfo_t compat_info;
|
||||
compat_info.si_signo = info.si_signo;
|
||||
compat_info.si_code = info.si_code;
|
||||
compat_info.si_errno = info.si_errno;
|
||||
compat_info.si_pid = info.si_pid;
|
||||
compat_info.si_uid = info.si_uid;
|
||||
compat_info.si_addr = (addr_t)info.si_addr;
|
||||
compat_info.si_status = info.si_status;
|
||||
compat_info.si_band = info.si_band;
|
||||
compat_info.si_value.sival_ptr = (addr_t)info.si_value.sival_ptr;
|
||||
if (user_memcpy(userInfo, &compat_info, sizeof(compat_info))
|
||||
< B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
} else if (user_memcpy(userInfo, &info, sizeof(info)) < B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
inline status_t
|
||||
copy_ref_var_from_user(stack_t* userStack, stack_t &stack)
|
||||
{
|
||||
if (!IS_USER_ADDRESS(userStack))
|
||||
return B_BAD_ADDRESS;
|
||||
Thread* thread = thread_get_current_thread();
|
||||
bool compatMode = (thread->flags & THREAD_FLAGS_COMPAT_MODE) != 0;
|
||||
if (compatMode) {
|
||||
compat_stack_t compatStack;
|
||||
if (user_memcpy(&compatStack, userStack, sizeof(compatStack))
|
||||
< B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
stack.ss_sp = (void*)(addr_t)compatStack.ss_sp;
|
||||
stack.ss_size = compatStack.ss_size;
|
||||
stack.ss_flags = compatStack.ss_flags;
|
||||
} else if (user_memcpy(&stack, userStack, sizeof(stack_t)) < B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
inline status_t
|
||||
copy_ref_var_to_user(stack_t &stack, stack_t* userStack)
|
||||
{
|
||||
if (!IS_USER_ADDRESS(userStack))
|
||||
return B_BAD_ADDRESS;
|
||||
Thread* thread = thread_get_current_thread();
|
||||
bool compatMode = (thread->flags & THREAD_FLAGS_COMPAT_MODE) != 0;
|
||||
if (compatMode) {
|
||||
compat_stack_t compatStack;
|
||||
compatStack.ss_sp = (addr_t)stack.ss_sp;
|
||||
compatStack.ss_size = stack.ss_size;
|
||||
compatStack.ss_flags = stack.ss_flags;
|
||||
if (user_memcpy(userStack, &compatStack, sizeof(compatStack))
|
||||
< B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
} else if (user_memcpy(userStack, &stack, sizeof(stack)) < B_OK) {
|
||||
return B_BAD_ADDRESS;
|
||||
}
|
||||
return B_OK;
|
||||
}
|
||||
|
||||
|
||||
#endif // _KERNEL_COMPAT_KSIGNAL_H
|
||||
@@ -0,0 +1,22 @@
|
||||
/*
|
||||
* Copyright 2018, Haiku Inc. All rights reserved.
|
||||
*
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef _KERNEL_COMPAT_SIGNAL_H
|
||||
#define _KERNEL_COMPAT_SIGNAL_H
|
||||
|
||||
|
||||
struct compat_sigaction {
|
||||
union {
|
||||
uint32 sa_handler;
|
||||
uint32 sa_sigaction;
|
||||
};
|
||||
sigset_t sa_mask;
|
||||
int sa_flags;
|
||||
uint32 sa_userdata; /* will be passed to the signal
|
||||
handler, BeOS extension */
|
||||
} _PACKED;
|
||||
|
||||
|
||||
#endif // _KERNEL_COMPAT_SIGNAL_H
|
||||
Reference in New Issue
Block a user