mirror of
https://github.com/t2linux/kernel.git
synced 2026-04-30 13:48:59 -07:00
Merge branch 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'syscalls' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits) [CVE-2009-0029] s390 specific system call wrappers [CVE-2009-0029] System call wrappers part 33 [CVE-2009-0029] System call wrappers part 32 [CVE-2009-0029] System call wrappers part 31 [CVE-2009-0029] System call wrappers part 30 [CVE-2009-0029] System call wrappers part 29 [CVE-2009-0029] System call wrappers part 28 [CVE-2009-0029] System call wrappers part 27 [CVE-2009-0029] System call wrappers part 26 [CVE-2009-0029] System call wrappers part 25 [CVE-2009-0029] System call wrappers part 24 [CVE-2009-0029] System call wrappers part 23 [CVE-2009-0029] System call wrappers part 22 [CVE-2009-0029] System call wrappers part 21 [CVE-2009-0029] System call wrappers part 20 [CVE-2009-0029] System call wrappers part 19 [CVE-2009-0029] System call wrappers part 18 [CVE-2009-0029] System call wrappers part 17 [CVE-2009-0029] System call wrappers part 16 [CVE-2009-0029] System call wrappers part 15 ...
This commit is contained in:
@@ -62,6 +62,9 @@ config HAVE_EFFICIENT_UNALIGNED_ACCESS
|
||||
See Documentation/unaligned-memory-access.txt for more
|
||||
information on the topic of unaligned memory accesses.
|
||||
|
||||
config HAVE_SYSCALL_WRAPPERS
|
||||
bool
|
||||
|
||||
config KRETPROBES
|
||||
def_bool y
|
||||
depends on KPROBES && HAVE_KRETPROBES
|
||||
|
||||
@@ -896,9 +896,9 @@ sys_getxpid:
|
||||
.end sys_getxpid
|
||||
|
||||
.align 4
|
||||
.globl sys_pipe
|
||||
.ent sys_pipe
|
||||
sys_pipe:
|
||||
.globl sys_alpha_pipe
|
||||
.ent sys_alpha_pipe
|
||||
sys_alpha_pipe:
|
||||
lda $sp, -16($sp)
|
||||
stq $26, 0($sp)
|
||||
.prologue 0
|
||||
@@ -916,7 +916,7 @@ sys_pipe:
|
||||
stq $1, 80+16($sp)
|
||||
1: lda $sp, 16($sp)
|
||||
ret
|
||||
.end sys_pipe
|
||||
.end sys_alpha_pipe
|
||||
|
||||
.align 4
|
||||
.globl sys_execve
|
||||
|
||||
@@ -52,7 +52,7 @@ sys_call_table:
|
||||
.quad sys_setpgid
|
||||
.quad alpha_ni_syscall /* 40 */
|
||||
.quad sys_dup
|
||||
.quad sys_pipe
|
||||
.quad sys_alpha_pipe
|
||||
.quad osf_set_program_attributes
|
||||
.quad alpha_ni_syscall
|
||||
.quad sys_open /* 45 */
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
CALL(sys_uselib)
|
||||
CALL(sys_swapon)
|
||||
CALL(sys_reboot)
|
||||
CALL(OBSOLETE(old_readdir)) /* used by libc4 */
|
||||
CALL(OBSOLETE(sys_old_readdir)) /* used by libc4 */
|
||||
/* 90 */ CALL(OBSOLETE(old_mmap)) /* used by libc4 */
|
||||
CALL(sys_munmap)
|
||||
CALL(sys_truncate)
|
||||
|
||||
@@ -691,7 +691,7 @@ sys_call_table:
|
||||
.long sys_uselib
|
||||
.long sys_swapon
|
||||
.long sys_reboot
|
||||
.long old_readdir
|
||||
.long sys_old_readdir
|
||||
.long old_mmap /* 90 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
|
||||
@@ -614,7 +614,7 @@ sys_call_table:
|
||||
.long sys_uselib
|
||||
.long sys_swapon
|
||||
.long sys_reboot
|
||||
.long old_readdir
|
||||
.long sys_old_readdir
|
||||
.long old_mmap /* 90 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
|
||||
@@ -103,7 +103,7 @@ SYMBOL_NAME_LABEL(sys_call_table)
|
||||
.long SYMBOL_NAME(sys_uselib)
|
||||
.long SYMBOL_NAME(sys_swapon)
|
||||
.long SYMBOL_NAME(sys_reboot)
|
||||
.long SYMBOL_NAME(old_readdir)
|
||||
.long SYMBOL_NAME(sys_old_readdir)
|
||||
.long SYMBOL_NAME(old_mmap) /* 90 */
|
||||
.long SYMBOL_NAME(sys_munmap)
|
||||
.long SYMBOL_NAME(sys_truncate)
|
||||
|
||||
@@ -220,7 +220,7 @@ ia32_syscall_table:
|
||||
data8 sys_mkdir
|
||||
data8 sys_rmdir /* 40 */
|
||||
data8 sys_dup
|
||||
data8 sys_pipe
|
||||
data8 sys_ia64_pipe
|
||||
data8 compat_sys_times
|
||||
data8 sys_ni_syscall /* old prof syscall holder */
|
||||
data8 sys32_brk /* 45 */
|
||||
|
||||
@@ -364,7 +364,7 @@ struct pt_regs;
|
||||
struct sigaction;
|
||||
long sys_execve(char __user *filename, char __user * __user *argv,
|
||||
char __user * __user *envp, struct pt_regs *regs);
|
||||
asmlinkage long sys_pipe(void);
|
||||
asmlinkage long sys_ia64_pipe(void);
|
||||
asmlinkage long sys_rt_sigaction(int sig,
|
||||
const struct sigaction __user *act,
|
||||
struct sigaction __user *oact,
|
||||
|
||||
@@ -1442,7 +1442,7 @@ sys_call_table:
|
||||
data8 sys_mkdir // 1055
|
||||
data8 sys_rmdir
|
||||
data8 sys_dup
|
||||
data8 sys_pipe
|
||||
data8 sys_ia64_pipe
|
||||
data8 sys_times
|
||||
data8 ia64_brk // 1060
|
||||
data8 sys_setgid
|
||||
|
||||
@@ -154,7 +154,7 @@ out:
|
||||
* and r9) as this is faster than doing a copy_to_user().
|
||||
*/
|
||||
asmlinkage long
|
||||
sys_pipe (void)
|
||||
sys_ia64_pipe (void)
|
||||
{
|
||||
struct pt_regs *regs = task_pt_regs(current);
|
||||
int fd[2];
|
||||
|
||||
@@ -513,7 +513,7 @@ sys_call_table:
|
||||
.long sys_uselib
|
||||
.long sys_swapon
|
||||
.long sys_reboot
|
||||
.long old_readdir
|
||||
.long sys_old_readdir
|
||||
.long old_mmap /* 90 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
|
||||
@@ -107,7 +107,7 @@ ENTRY(sys_call_table)
|
||||
.long sys_uselib
|
||||
.long sys_ni_syscall /* sys_swapon */
|
||||
.long sys_reboot
|
||||
.long old_readdir
|
||||
.long sys_old_readdir
|
||||
.long old_mmap /* 90 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
|
||||
@@ -398,7 +398,7 @@ einval: li v0, -ENOSYS
|
||||
sys sys_uselib 1
|
||||
sys sys_swapon 2
|
||||
sys sys_reboot 3
|
||||
sys old_readdir 3
|
||||
sys sys_old_readdir 3
|
||||
sys old_mmap 6 /* 4090 */
|
||||
sys sys_munmap 2
|
||||
sys sys_truncate 2
|
||||
|
||||
@@ -478,7 +478,7 @@ ENTRY(sys_call_table)
|
||||
.long sys_uselib
|
||||
.long sys_swapon
|
||||
.long sys_reboot
|
||||
.long old_readdir
|
||||
.long sys_old_readdir
|
||||
.long old_mmap /* 90 */
|
||||
.long sys_munmap
|
||||
.long sys_truncate
|
||||
|
||||
@@ -123,6 +123,7 @@ config PPC
|
||||
select HAVE_DMA_ATTRS if PPC64
|
||||
select USE_GENERIC_SMP_HELPERS if SMP
|
||||
select HAVE_OPROFILE
|
||||
select HAVE_SYSCALL_WRAPPERS if PPC64
|
||||
|
||||
config EARLY_PRINTK
|
||||
bool
|
||||
|
||||
@@ -92,7 +92,7 @@ COMPAT_SYS_SPU(readlink)
|
||||
SYSCALL(uselib)
|
||||
SYSCALL(swapon)
|
||||
SYSCALL(reboot)
|
||||
SYSX(sys_ni_syscall,compat_sys_old_readdir,old_readdir)
|
||||
SYSX(sys_ni_syscall,compat_sys_old_readdir,sys_old_readdir)
|
||||
SYSCALL_SPU(mmap)
|
||||
SYSCALL_SPU(munmap)
|
||||
SYSCALL_SPU(truncate)
|
||||
|
||||
@@ -77,6 +77,7 @@ mainmenu "Linux Kernel Configuration"
|
||||
config S390
|
||||
def_bool y
|
||||
select USE_GENERIC_SMP_HELPERS if SMP
|
||||
select HAVE_SYSCALL_WRAPPERS
|
||||
select HAVE_FUNCTION_TRACER
|
||||
select HAVE_OPROFILE
|
||||
select HAVE_KPROBES
|
||||
|
||||
@@ -547,7 +547,7 @@ sys32_setdomainname_wrapper:
|
||||
.globl sys32_newuname_wrapper
|
||||
sys32_newuname_wrapper:
|
||||
llgtr %r2,%r2 # struct new_utsname *
|
||||
jg s390x_newuname # branch to system call
|
||||
jg sys_s390_newuname # branch to system call
|
||||
|
||||
.globl compat_sys_adjtimex_wrapper
|
||||
compat_sys_adjtimex_wrapper:
|
||||
@@ -615,7 +615,7 @@ sys32_sysfs_wrapper:
|
||||
.globl sys32_personality_wrapper
|
||||
sys32_personality_wrapper:
|
||||
llgfr %r2,%r2 # unsigned long
|
||||
jg s390x_personality # branch to system call
|
||||
jg sys_s390_personality # branch to system call
|
||||
|
||||
.globl sys32_setfsuid16_wrapper
|
||||
sys32_setfsuid16_wrapper:
|
||||
|
||||
@@ -30,23 +30,23 @@ struct fadvise64_64_args;
|
||||
struct old_sigaction;
|
||||
struct sel_arg_struct;
|
||||
|
||||
long sys_pipe(unsigned long __user *fildes);
|
||||
long sys_mmap2(struct mmap_arg_struct __user *arg);
|
||||
long old_mmap(struct mmap_arg_struct __user *arg);
|
||||
long sys_s390_old_mmap(struct mmap_arg_struct __user *arg);
|
||||
long sys_ipc(uint call, int first, unsigned long second,
|
||||
unsigned long third, void __user *ptr);
|
||||
long s390x_newuname(struct new_utsname __user *name);
|
||||
long s390x_personality(unsigned long personality);
|
||||
long s390_fadvise64(int fd, u32 offset_high, u32 offset_low,
|
||||
long sys_s390_newuname(struct new_utsname __user *name);
|
||||
long sys_s390_personality(unsigned long personality);
|
||||
long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low,
|
||||
size_t len, int advice);
|
||||
long s390_fadvise64_64(struct fadvise64_64_args __user *args);
|
||||
long s390_fallocate(int fd, int mode, loff_t offset, u32 len_high, u32 len_low);
|
||||
long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
|
||||
long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,
|
||||
u32 len_low);
|
||||
long sys_fork(void);
|
||||
long sys_clone(void);
|
||||
long sys_vfork(void);
|
||||
void execve_tail(void);
|
||||
long sys_execve(void);
|
||||
int sys_sigsuspend(int history0, int history1, old_sigset_t mask);
|
||||
long sys_sigsuspend(int history0, int history1, old_sigset_t mask);
|
||||
long sys_sigaction(int sig, const struct old_sigaction __user *act,
|
||||
struct old_sigaction __user *oact);
|
||||
long sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss);
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user