Module Name: src
Committed By: maxv
Date: Mon Feb 13 15:03:18 UTC 2017
Modified Files:
src/sys/compat/linux/arch/amd64: linux_machdep.c
Log Message:
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.50 -r1.51 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.50 src/sys/compat/linux/arch/amd64/linux_machdep.c:1.51
--- src/sys/compat/linux/arch/amd64/linux_machdep.c:1.50 Mon Feb 13 14:54:11 2017
+++ src/sys/compat/linux/arch/amd64/linux_machdep.c Mon Feb 13 15:03:18 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_machdep.c,v 1.50 2017/02/13 14:54:11 maxv Exp $ */
+/* $NetBSD: linux_machdep.c,v 1.51 2017/02/13 15:03:18 maxv Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.50 2017/02/13 14:54:11 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.51 2017/02/13 15:03:18 maxv Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -457,7 +457,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,
@@ -487,6 +487,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 */
