Module Name: src
Committed By: snj
Date: Sat Mar 25 17:18:25 UTC 2017
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-6]: trap.c
src/sys/arch/i386/i386 [netbsd-6]: trap.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1446):
sys/arch/amd64/amd64/trap.c: revision 1.94
sys/arch/i386/i386/trap.c: revision 1.287
Mmh, allow iret to be handled when an #SS fault (T_STKFLT) happens. Even
if the sdm is far from being clear, it appears that iret can trigger an #SS
fault if %ss points to a writable but non-present segment; in which case
the kernel would panic, thinking the fault was internal to it.
In particular, userland can create a broken segment in the ldt with
USER_LDT, update its %ss with setcontext and trigger the panic. I don't
think amd64 is affected since USER_LDT does not exist there, and the
changes on tf_ss seem correct - but I'm still adding T_STKFLT for safety.
To generate a diff of this commit:
cvs rdiff -u -r1.69.2.1 -r1.69.2.2 src/sys/arch/amd64/amd64/trap.c
cvs rdiff -u -r1.262 -r1.262.8.1 src/sys/arch/i386/i386/trap.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/arch/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.69.2.1 src/sys/arch/amd64/amd64/trap.c:1.69.2.2
--- src/sys/arch/amd64/amd64/trap.c:1.69.2.1 Sun Jun 3 21:45:10 2012
+++ src/sys/arch/amd64/amd64/trap.c Sat Mar 25 17:18:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.69.2.1 2012/06/03 21:45:10 jdc Exp $ */
+/* $NetBSD: trap.c,v 1.69.2.2 2017/03/25 17:18:25 snj Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.69.2.1 2012/06/03 21:45:10 jdc Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.69.2.2 2017/03/25 17:18:25 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -294,6 +294,7 @@ trap(struct trapframe *frame)
case T_PROTFLT:
case T_SEGNPFLT:
case T_ALIGNFLT:
+ case T_STKFLT:
case T_TSSFLT:
if (p == NULL)
goto we_re_toast;
Index: src/sys/arch/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.262 src/sys/arch/i386/i386/trap.c:1.262.8.1
--- src/sys/arch/i386/i386/trap.c:1.262 Wed Sep 7 09:24:55 2011
+++ src/sys/arch/i386/i386/trap.c Sat Mar 25 17:18:25 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.262 2011/09/07 09:24:55 reinoud Exp $ */
+/* $NetBSD: trap.c,v 1.262.8.1 2017/03/25 17:18:25 snj Exp $ */
/*-
* Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.262 2011/09/07 09:24:55 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.262.8.1 2017/03/25 17:18:25 snj Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -405,6 +405,7 @@ trap(struct trapframe *frame)
#endif
case T_SEGNPFLT:
case T_ALIGNFLT:
+ case T_STKFLT:
case T_TSSFLT:
if (p == NULL)
goto we_re_toast;
