CVS commit: [netbsd-6] src/sys/compat/linux/arch/amd64
Module Name:src Committed By: snj Date: Tue Feb 14 16:59:31 UTC 2017 Modified Files: src/sys/compat/linux/arch/amd64 [netbsd-6]: linux_machdep.c Log Message: Pull up following revision(s) (requested by maxv in ticket #1433): sys/compat/linux/arch/amd64/linux_machdep.c: 1.50, 1.51 Don't let userland choose %rip. This is the Intel Sysret vulnerability again. -- Make sure %rip is in userland. This is harmless, since the return to userland is made with iret instead of sysret in this path. While here, use size_t. To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.39.6.1 \ src/sys/compat/linux/arch/amd64/linux_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/amd64/linux_machdep.c diff -u src/sys/compat/linux/arch/amd64/linux_machdep.c:1.39 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.39.6.1 --- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.39 Fri Nov 18 04:07:43 2011 +++ src/sys/compat/linux/arch/amd64/linux_machdep.c Tue Feb 14 16:59:31 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_machdep.c,v 1.39 2011/11/18 04:07:43 christos Exp $ */ +/* $NetBSD: linux_machdep.c,v 1.39.6.1 2017/02/14 16:59:31 snj Exp $ */ /*- * Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved. @@ -33,7 +33,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.39 2011/11/18 04:07:43 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.39.6.1 2017/02/14 16:59:31 snj Exp $"); #include #include @@ -254,7 +254,12 @@ linux_sendsig(const ksiginfo_t *ksi, con if (error != 0) { sigexit(l, SIGILL); return; - } + } + + if ((vaddr_t)catcher >= VM_MAXUSER_ADDRESS) { + sigexit(l, SIGILL); + return; + } linux_buildcontext(l, catcher, sp); tf->tf_rdi = sigframe.info.lsi_signo; @@ -485,7 +490,7 @@ linux_usertrap(struct lwp *l, vaddr_t tr { struct trapframe *tf = arg; uint64_t retaddr; - int vsyscallnr; + size_t vsyscallnr; /* * Check for a vsyscall. %rip must be the fault address, @@ -515,6 +520,8 @@ linux_usertrap(struct lwp *l, vaddr_t tr */ if (copyin((void *)tf->tf_rsp, &retaddr, sizeof retaddr) != 0) return 0; + if ((vaddr_t)retaddr >= VM_MAXUSER_ADDRESS) + return 0; tf->tf_rip = retaddr; tf->tf_rax = linux_vsyscall_to_syscall[vsyscallnr]; tf->tf_rsp += 8; /* "pop" the return address */
CVS commit: [netbsd-6] src/sys/compat/linux/arch
Module Name:src Committed By: bouyer Date: Sun Nov 15 20:42:32 UTC 2015 Modified Files: src/sys/compat/linux/arch/arm [netbsd-6]: linux_ptrace.c src/sys/compat/linux/arch/i386 [netbsd-6]: linux_ptrace.c src/sys/compat/linux/arch/powerpc [netbsd-6]: linux_ptrace.c Log Message: Pull up following revision(s) (requested by pgoyette in ticket #1335): sys/compat/linux/arch/i386/linux_ptrace.c: revision 1.31 sys/compat/linux/arch/arm/linux_ptrace.c: revision 1.19 sys/compat/linux/arch/powerpc/linux_ptrace.c: revision 1.29 Don't release proc_lock until we're done looking at things that are protected by the lock, particularly p_stat and p_waited. Found by Robert Elz. XXX Pullup to NetBSD-7, -6, -6-0, and -6-1 To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.14.1 src/sys/compat/linux/arch/arm/linux_ptrace.c cvs rdiff -u -r1.26 -r1.26.14.1 src/sys/compat/linux/arch/i386/linux_ptrace.c cvs rdiff -u -r1.23 -r1.23.14.1 \ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/arm/linux_ptrace.c diff -u src/sys/compat/linux/arch/arm/linux_ptrace.c:1.16 src/sys/compat/linux/arch/arm/linux_ptrace.c:1.16.14.1 --- src/sys/compat/linux/arch/arm/linux_ptrace.c:1.16 Wed Jul 7 01:30:33 2010 +++ src/sys/compat/linux/arch/arm/linux_ptrace.c Sun Nov 15 20:42:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.16 2010/07/07 01:30:33 chs Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.16.14.1 2015/11/15 20:42:32 bouyer Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.16 2010/07/07 01:30:33 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.16.14.1 2015/11/15 20:42:32 bouyer Exp $"); #include #include @@ -140,7 +140,6 @@ linux_sys_ptrace_arch(struct lwp *l, con goto out; } mutex_enter(t->p_lock); - mutex_exit(proc_lock); /* * You cannot do what you want to the process if: @@ -148,6 +147,7 @@ linux_sys_ptrace_arch(struct lwp *l, con */ if (!ISSET(t->p_slflag, PSL_TRACED)) { mutex_exit(t->p_lock); + mutex_exit(proc_lock); error = EPERM; goto out; } @@ -160,9 +160,11 @@ linux_sys_ptrace_arch(struct lwp *l, con if (ISSET(t->p_slflag, PSL_FSTRACE) || t->p_pptr != p || t->p_stat != SSTOP || !t->p_waited) { mutex_exit(t->p_lock); + mutex_exit(proc_lock); error = EBUSY; goto out; } + mutex_exit(proc_lock); /* XXX: ptrace needs revamp for multi-threading support. */ if (t->p_nlwps > 1) { mutex_exit(t->p_lock); Index: src/sys/compat/linux/arch/i386/linux_ptrace.c diff -u src/sys/compat/linux/arch/i386/linux_ptrace.c:1.26 src/sys/compat/linux/arch/i386/linux_ptrace.c:1.26.14.1 --- src/sys/compat/linux/arch/i386/linux_ptrace.c:1.26 Wed Jul 7 01:30:34 2010 +++ src/sys/compat/linux/arch/i386/linux_ptrace.c Sun Nov 15 20:42:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.26 2010/07/07 01:30:34 chs Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.26.14.1 2015/11/15 20:42:32 bouyer Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.26 2010/07/07 01:30:34 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.26.14.1 2015/11/15 20:42:32 bouyer Exp $"); #include #include @@ -184,7 +184,6 @@ linux_sys_ptrace_arch(struct lwp *l, con return ESRCH; } mutex_enter(t->p_lock); - mutex_exit(proc_lock); /* * You cannot do what you want to the process if: @@ -192,6 +191,7 @@ linux_sys_ptrace_arch(struct lwp *l, con */ if (!ISSET(t->p_slflag, PSL_TRACED)) { mutex_exit(t->p_lock); + mutex_exit(proc_lock); error = EPERM; goto out; } @@ -204,9 +204,11 @@ linux_sys_ptrace_arch(struct lwp *l, con if (ISSET(t->p_slflag, PSL_FSTRACE) || t->p_pptr != p || t->p_stat != SSTOP || !t->p_waited) { mutex_exit(t->p_lock); + mutex_exit(proc_lock); error = EBUSY; goto out; } + mutex_exit(proc_lock); /* XXX: ptrace needs revamp for multi-threading support. */ if (t->p_nlwps > 1) { mutex_exit(t->p_lock); Index: src/sys/compat/linux/arch/powerpc/linux_ptrace.c diff -u src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.23 src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.23.14.1 --- src/sys/compat/linux/arch/powerpc/linux_ptrace.c:1.23 Thu Jul 1 02:38:28 2010 +++ src/sys/compat/linux/arch/powerpc/linux_ptrace.c Sun Nov 15 20:42:32 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_ptrace.c,v 1.23 2010/07/01 02:38:28 rmind Exp $ */ +/* $NetBSD: linux_ptrace.c,v 1.23.14.1 2015/11/15 20:42:32 bouyer Exp $ */ /*- * Copyright (c) 1999, 2001 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_ptrace.c,v 1.23 2010/07/01 02:38:28 rmind Exp $"); +__KERNEL_RCSID(0, "$NetBSD: li
CVS commit: [netbsd-6] src/sys/compat/linux/arch/i386
Module Name:src Committed By: bouyer Date: Sun Mar 25 11:25:26 UTC 2012 Modified Files: src/sys/compat/linux/arch/i386 [netbsd-6]: linux_exec.h Log Message: Pull up following revision(s) (requested by chs in ticket #140): sys/compat/linux/arch/i386/linux_exec.h: revision 1.11 define LINUX_DEBUGLINK_SIGNATURE for i386 too. this allows linux ldd to work. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.10.22.1 src/sys/compat/linux/arch/i386/linux_exec.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/i386/linux_exec.h diff -u src/sys/compat/linux/arch/i386/linux_exec.h:1.10 src/sys/compat/linux/arch/i386/linux_exec.h:1.10.22.1 --- src/sys/compat/linux/arch/i386/linux_exec.h:1.10 Mon Nov 17 13:03:42 2008 +++ src/sys/compat/linux/arch/i386/linux_exec.h Sun Mar 25 11:25:26 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec.h,v 1.10 2008/11/17 13:03:42 ad Exp $ */ +/* $NetBSD: linux_exec.h,v 1.10.22.1 2012/03/25 11:25:26 bouyer Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -39,6 +39,8 @@ #define LINUX_ELF_AUX_ARGSIZ \ (howmany(LINUX_ELF_AUX_ENTRIES * sizeof(Aux32Info), sizeof(Elf32_Addr))) +#define LINUX_DEBUGLINK_SIGNATURE + #ifdef _KERNEL int linux_exec_setup_stack(struct lwp *, struct exec_package *); #endif
CVS commit: [netbsd-6] src/sys/compat/linux/arch/powerpc
Module Name:src Committed By: riz Date: Fri Feb 24 16:38:07 UTC 2012 Modified Files: src/sys/compat/linux/arch/powerpc [netbsd-6]: linux_exec_powerpc.c Log Message: Pull up following revision(s) (requested by rjs in ticket #46): sys/compat/linux/arch/powerpc/linux_exec_powerpc.c: revision 1.24 Switch to ANSI style declaration. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.23.2.1 \ src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c diff -u src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c:1.23 src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c:1.23.2.1 --- src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c:1.23 Fri Feb 3 20:11:53 2012 +++ src/sys/compat/linux/arch/powerpc/linux_exec_powerpc.c Fri Feb 24 16:38:07 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: linux_exec_powerpc.c,v 1.23 2012/02/03 20:11:53 matt Exp $ */ +/* $NetBSD: linux_exec_powerpc.c,v 1.23.2.1 2012/02/24 16:38:07 riz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: linux_exec_powerpc.c,v 1.23 2012/02/03 20:11:53 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_exec_powerpc.c,v 1.23.2.1 2012/02/24 16:38:07 riz Exp $"); #define ELFSIZE 32 @@ -62,12 +62,9 @@ __KERNEL_RCSID(0, "$NetBSD: linux_exec_p * Alpha and PowerPC specific linux copyargs function. */ int -ELFNAME2(linux,copyargs)(l, pack, arginfo, stackp, argp) - struct lwp *l; - struct exec_package *pack; - struct ps_strings *arginfo; - char **stackp; - void *argp; +ELFNAME2(linux,copyargs)(struct lwp *l, struct exec_package *pack, + struct ps_strings *arginfo, char **stackp, + void *argp) { size_t len; AuxInfo ai[LINUX_ELF_AUX_ENTRIES], *a;