Module Name: src
Committed By: chs
Date: Sun Sep 5 20:14:40 UTC 2010
Modified Files:
src/sys/arch/amd64/amd64: netbsd32_machdep.c
src/sys/arch/amd64/include: segments.h
Log Message:
in check_mcontext32(), accept the LDT selector for 32-bit user code
as well as the GDT selector. fixes PR 43835.
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amd64/include/segments.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/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.65 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.66
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.65 Sun Aug 8 18:13:54 2010
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Sun Sep 5 20:14:39 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.65 2010/08/08 18:13:54 chs Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.66 2010/09/05 20:14:39 chs Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.65 2010/08/08 18:13:54 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.66 2010/09/05 20:14:39 chs Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -991,7 +991,7 @@
pcb = lwp_getpcb(l);
if (((gr[_REG32_EFL] ^ tf->tf_rflags) & PSL_USERSTATIC) != 0 ||
- gr[_REG32_CS] != GSEL(GUCODE32_SEL, SEL_UPL))
+ !VALID_USER_CSEL32(gr[_REG32_CS]))
return EINVAL;
if (gr[_REG32_FS] != 0 && !VALID_USER_DSEL32(gr[_REG32_FS]) &&
!(gr[_REG32_FS] == GSEL(GUFS_SEL, SEL_UPL) && pcb->pcb_fs != 0))
Index: src/sys/arch/amd64/include/segments.h
diff -u src/sys/arch/amd64/include/segments.h:1.20 src/sys/arch/amd64/include/segments.h:1.21
--- src/sys/arch/amd64/include/segments.h:1.20 Wed Jul 7 01:14:52 2010
+++ src/sys/arch/amd64/include/segments.h Sun Sep 5 20:14:40 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: segments.h,v 1.20 2010/07/07 01:14:52 chs Exp $ */
+/* $NetBSD: segments.h,v 1.21 2010/09/05 20:14:40 chs Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -395,10 +395,8 @@
#define VALID_USER_DSEL32(s) \
(((s) & 0xffff) == GSEL(GUDATA32_SEL, SEL_UPL) || \
((s) & 0xffff) == LSEL(LUDATA32_SEL, SEL_UPL))
-#if 0 /* not used */
#define VALID_USER_CSEL32(s) \
((s) == GSEL(GUCODE32_SEL, SEL_UPL) || (s) == LSEL(LUCODE32_SEL, SEL_UPL))
-#endif
#define VALID_USER_CSEL(s) \
((s) == GSEL(GUCODE_SEL, SEL_UPL) || (s) == LSEL(LUCODE_SEL, SEL_UPL))
