Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use VALID_R15_PSR() to check the context we're restoring in 

linux_sys_sigreturn().  Somehow this got missed when I introduced that macro.
This commit is contained in:
bjh21 2006-08-23 21:16:58 +00:00
parent 3c488ef896
commit a707189c87
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sys/compat/linux/arch/arm/linux_machdep.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_machdep.c,v 1.17 2005/12/11 12:20:14 christos Exp $ */
/* $NetBSD: linux_machdep.c,v 1.18 2006/08/23 21:16:58 bjh21 Exp $ */
/*-
* Copyright (c) 1995, 2000 The NetBSD Foundation, Inc.
@ -38,7 +38,7 @@
#include <sys/param.h>
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.17 2005/12/11 12:20:14 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_machdep.c,v 1.18 2006/08/23 21:16:58 bjh21 Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -227,15 +227,8 @@ linux_sys_sigreturn(l, v, retval)
* Make sure the processor mode has not been tampered with and
* interrupts have not been disabled.
*/
#ifdef __PROG32
if ((frame.sf_sc.sc_cpsr & PSR_MODE) != PSR_USR32_MODE ||
(frame.sf_sc.sc_cpsr & (I32_bit | F32_bit)) != 0)
return (EINVAL);
#else /* __PROG26 */
if ((frame.sf_sc.sc_pc & R15_MODE) != R15_MODE_USR ||
(frame.sf_sc.sc_pc & (R15_IRQ_DISABLE | R15_FIQ_DISABLE)) != 0)
if (!VALID_R15_PSR(frame.sf_sc.sc_pc, frame.sf_sc.sc_cpsr))
return EINVAL;
#endif
/* Restore register context. */
tf = process_frame(l);