kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

um: kill includes of sysdep/sigcontext.h from stuff built with kernel headers

Browse source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro 2011-08-18 20:03:59 +01:00 committed by Richard Weinberger
parent 51d3474905
commit adcfb9852d
8 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/um/kernel/signal.c
View file

@ -11,7 +11,6 @@
#include <asm/unistd.h> #include <asm/unistd.h>
#include "frame_kern.h" #include "frame_kern.h"
#include "kern_util.h" #include "kern_util.h"
#include <sysdep/sigcontext.h>
EXPORT_SYMBOL(block_signals); EXPORT_SYMBOL(block_signals);
EXPORT_SYMBOL(unblock_signals); EXPORT_SYMBOL(unblock_signals);

1
arch/um/kernel/trap.c
View file

@ -14,7 +14,6 @@
#include "kern_util.h" #include "kern_util.h"
#include "os.h" #include "os.h"
#include "skas.h" #include "skas.h"
#include "sysdep/sigcontext.h"
/* /*
* Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by * Note this is constrained to return 0, -EFAULT, -EACCESS, -ENOMEM by

6
arch/um/sys-x86/shared/sysdep/faultinfo_32.h
View file

@ -24,6 +24,12 @@ struct faultinfo {
#define FAULT_WRITE(fi) ((fi).error_code & 2) #define FAULT_WRITE(fi) ((fi).error_code & 2)
#define FAULT_ADDRESS(fi) ((fi).cr2) #define FAULT_ADDRESS(fi) ((fi).cr2)
/* This is Page Fault */
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
/* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */
#define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo)
#define PTRACE_FULL_FAULTINFO 0 #define PTRACE_FULL_FAULTINFO 0
#endif #endif

6
arch/um/sys-x86/shared/sysdep/faultinfo_64.h
View file

@ -24,6 +24,12 @@ struct faultinfo {
#define FAULT_WRITE(fi) ((fi).error_code & 2) #define FAULT_WRITE(fi) ((fi).error_code & 2)
#define FAULT_ADDRESS(fi) ((fi).cr2) #define FAULT_ADDRESS(fi) ((fi).cr2)
/* This is Page Fault */
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
/* No broken SKAS API, which doesn't pass trap_no, here. */
#define SEGV_MAYBE_FIXABLE(fi) 0
#define PTRACE_FULL_FAULTINFO 1 #define PTRACE_FULL_FAULTINFO 1
#endif #endif

1
arch/um/sys-x86/shared/sysdep/ptrace_32.h
View file

@ -43,6 +43,7 @@ extern int sysemu_supported;
#define REGS_SET_SYSCALL_RETURN(r, res) REGS_EAX(r) = (res) #define REGS_SET_SYSCALL_RETURN(r, res) REGS_EAX(r) = (res)
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
#define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r)) #define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r))
#ifndef PTRACE_SYSEMU_SINGLESTEP #ifndef PTRACE_SYSEMU_SINGLESTEP

5
arch/um/sys-x86/shared/sysdep/ptrace_64.h
View file

@ -69,10 +69,9 @@
#define REGS_SET_SYSCALL_RETURN(r, res) REGS_RAX(r) = (res) #define REGS_SET_SYSCALL_RETURN(r, res) REGS_RAX(r) = (res)
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
#define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r)) #define REGS_RESTART_SYSCALL(r) IP_RESTART_SYSCALL(REGS_IP(r))
#define REGS_SEGV_IS_FIXABLE(r) SEGV_IS_FIXABLE((r)->trap_type)
#define REGS_FAULT_ADDR(r) ((r)->fault_addr) #define REGS_FAULT_ADDR(r) ((r)->fault_addr)
#define REGS_FAULT_WRITE(r) FAULT_WRITE((r)->fault_type) #define REGS_FAULT_WRITE(r) FAULT_WRITE((r)->fault_type)
@ -152,8 +151,6 @@ struct syscall_args {
#define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp) #define UPT_RESTART_SYSCALL(r) REGS_RESTART_SYSCALL((r)->gp)
#define UPT_SEGV_IS_FIXABLE(r) REGS_SEGV_IS_FIXABLE(&r->skas)
#define UPT_FAULTINFO(r) (&(r)->faultinfo) #define UPT_FAULTINFO(r) (&(r)->faultinfo)
static inline void arch_init_registers(int pid) static inline void arch_init_registers(int pid)

8
arch/um/sys-x86/shared/sysdep/sigcontext_32.h
View file

@ -8,8 +8,6 @@
#include <generated/user_constants.h> #include <generated/user_constants.h>
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
#define SC_OFFSET(sc, field) \ #define SC_OFFSET(sc, field) \
*((unsigned long *) &(((char *) (sc))[HOST_##field])) *((unsigned long *) &(((char *) (sc))[HOST_##field]))
@ -24,10 +22,4 @@
(fi).trap_no = SC_TRAPNO(sc); \ (fi).trap_no = SC_TRAPNO(sc); \
} }
/* This is Page Fault */
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
/* SKAS3 has no trap_no on i386, but get_skas_faultinfo() sets it to 0. */
#define SEGV_MAYBE_FIXABLE(fi) ((fi)->trap_no == 0 && ptrace_faultinfo)
#endif #endif

8
arch/um/sys-x86/shared/sysdep/sigcontext_64.h
View file

@ -15,8 +15,6 @@
#define SC_ERR(sc) SC_OFFSET(sc, SC_ERR) #define SC_ERR(sc) SC_OFFSET(sc, SC_ERR)
#define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO) #define SC_TRAPNO(sc) SC_OFFSET(sc, SC_TRAPNO)
#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)
#define GET_FAULTINFO_FROM_SC(fi, sc) \ #define GET_FAULTINFO_FROM_SC(fi, sc) \
{ \ { \
(fi).cr2 = SC_CR2(sc); \ (fi).cr2 = SC_CR2(sc); \
@ -24,10 +22,4 @@
(fi).trap_no = SC_TRAPNO(sc); \ (fi).trap_no = SC_TRAPNO(sc); \
} }
/* This is Page Fault */
#define SEGV_IS_FIXABLE(fi) ((fi)->trap_no == 14)
/* No broken SKAS API, which doesn't pass trap_no, here. */
#define SEGV_MAYBE_FIXABLE(fi) 0
#endif #endif