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

Fix a signal handler bug originally reported by Hugh Graham some year ago: 

If two signals are sent after each other without the process being run in
userspace between them then the second one will overwrite part of the signal
info stored on the userstack.
Fixed by rewriting and simplifying both the signal delivery code and the
trampoline code. Also bump signal version number to 2.
Rename __sigtramp1.S to __sigtramp.S.
This commit is contained in:
ragge 2002-09-12 18:28:22 +00:00
parent 32923df5d6
commit 2e409d7d44
2 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/libc/arch/vax/sys/__sigaction14_sigtramp.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: __sigaction14_sigtramp.c,v 1.1 2002/07/09 23:32:39 thorpej Exp $ */ /* $NetBSD: __sigaction14_sigtramp.c,v 1.2 2002/09/12 18:28:22 ragge Exp $ */
/*- /*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. * Copyright (c) 2002 The NetBSD Foundation, Inc.
@ -46,7 +46,7 @@
int int
__sigaction14(int sig, const struct sigaction *act, struct sigaction *oact) __sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
{ {
extern int __sigtramp_sigcontext_1[]; extern int __sigtramp_sigcontext_2[];
/* /*
* Right here we should select the SA_SIGINFO trampoline * Right here we should select the SA_SIGINFO trampoline
@ -54,5 +54,5 @@ __sigaction14(int sig, const struct sigaction *act, struct sigaction *oact)
*/ */
return (__sigaction_sigtramp(sig, act, oact, return (__sigaction_sigtramp(sig, act, oact,
__sigtramp_sigcontext_1, 1)); __sigtramp_sigcontext_2, 2));
} }

34
lib/libc/arch/vax/sys/__sigtramp1.S → lib/libc/arch/vax/sys/__sigtramp.S
View File

@ -1,7 +1,7 @@
/* $NetBSD: __sigtramp1.S,v 1.1 2002/07/09 23:32:39 thorpej Exp $ */ /* $NetBSD: __sigtramp.S,v 1.1 2002/09/12 18:28:22 ragge Exp $ */
/* /*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden. * Copyright (c) 2002 Anders Magnusson, (ragge@netbsd.org).
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -12,10 +12,7 @@
* 2. Redistributions in binary form must reproduce the above copyright * 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the * notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution. * documentation and/or other materials provided with the distribution.
* 3. All advertising materials mentioning features or use of this software * 3. The name of the author may not be used to endorse or promote products
* must display the following acknowledgement:
* This product includes software developed at Ludd, University of Lule}.
* 4. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission * derived from this software without specific prior written permission
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
@ -30,18 +27,23 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
/*
* Signal trampoline; registers when called:
* sp, pc, psl - obvious
* ap - points to argument list, see machdep.c:sendsig()
* fp - address of signal handler
*/
#include "SYS.h" #include "SYS.h"
.text .text
_ALIGN_TEXT _ALIGN_TEXT
.globl _C_LABEL(__sigtramp_sigcontext_1) .globl _C_LABEL(__sigtramp_sigcontext_2)
_C_LABEL(__sigtramp_sigcontext_1): _C_LABEL(__sigtramp_sigcontext_2):
pushr $0x3f pushr $(R0|R1|R2|R3|R4|R5) # save scratch registers
subl2 $0xc,%sp callg (%ap),(%fp) # use global arg list
movl 0x24(%sp),%r0 popr $(R0|R1|R2|R3|R4|R5) # restore regs
calls $3,(%r0) movab 8(%ap),%ap # arg is pointer to sigctx
popr $0x3f SYSTRAP(__sigreturn14) # exit from here
SYSTRAP(__sigreturn14) halt # illegal insn
SYSTRAP(exit)
halt