search for: oact

Commit 8418552 ("[klibc] ia64: Fix shared build") missed this use of the GP register, although the code appears to have been dubious anyway, assuming the address of errno was the first thing pointed to by GP. --- usr/klibc/arch/ia64/vfork.S | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/usr/klibc/arch/ia64/vfork.S b/usr/klibc/arch/ia64/vfork.S index

.../ + +#include <signal.h> +#include <sys/syscall.h> + +__extern void __sigreturn(void); +__extern int ____rt_sigaction(int, const struct sigaction *, struct sigaction *, + size_t, void (*)(void)); + +int __rt_sigaction(int sig, const struct sigaction *act, + struct sigaction *oact, size_t size) +{ + return ____rt_sigaction(sig, act, oact, size, &__sigreturn); +} diff --git a/usr/klibc/arch/sparc/Kbuild b/usr/klibc/arch/sparc/Kbuild index d013f5d4..d92bbb0f 100644 --- a/usr/klibc/arch/sparc/Kbuild +++ b/usr/klibc/arch/sparc/Kbuild @@ -8,7 +8,7 @@ targets := crt0.o m4-tar...

...date it, and pass that to the kernel + instead (the descriptor must remain valid after returning from sigaction + until it is replaced). */ +struct { + uintptr_t entry; + uintptr_t gp; +} signal_descriptors[_NSIG]; +#endif + int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { int rv; -#if _KLIBC_NEEDS_SA_RESTORER +#if _KLIBC_NEEDS_SA_RESTORER || defined(__ia64__) struct sigaction sa; +#endif +#ifdef __ia64__ + uintptr_t old_entry; +#endif +#if _KLIBC_NEEDS_SA_RESTORER if (act && !(act->sa_flags & SA_RESTORER)) { sa = *act; act = &s...

...igaction.c index e512bdcd..7f01ea44 100644 --- a/usr/klibc/arch/ia64/sigaction.c +++ b/usr/klibc/arch/ia64/sigaction.c @@ -21,6 +21,7 @@ __extern int ____rt_sigaction(int, const struct sigaction *, struct sigaction *, int __rt_sigaction(int sig, const struct sigaction *act, struct sigaction *oact, size_t size) { + sigset_t signal_mask, old_signal_mask; uintptr_t old_entry; int rv; @@ -29,6 +30,13 @@ int __rt_sigaction(int sig, const struct sigaction *act, return -1; } + /* Mask the signal to avoid races on access to its descriptor */ + sigemptyset(&signal_mask); + sigaddse...

...__extern int __rt_sigaction(int, act_type, struct sigaction *, size_t); #else -__extern int __sigaction(int, const struct sigaction *, struct sigaction *); +__extern int __sigaction(int, act_type, struct sigaction *); #endif int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) @@ -28,7 +34,9 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) struct sigaction sa; int rv; - if (act && (act->sa_flags & needed_flags) != needed_flags) { + if (act && + ((act->sa_flags & needed_flags) != needed_flags || +...

...ia64/sigaction.c index c1ea5fdd..3d2dbd44 100644 --- a/usr/klibc/arch/ia64/sigaction.c +++ b/usr/klibc/arch/ia64/sigaction.c @@ -21,6 +21,7 @@ __extern int ____rt_sigaction(int, const struct sigaction *, struct sigaction *, int __rt_sigaction(int sig, struct sigaction *act, struct sigaction *oact, size_t size) { + sigset_t signal_mask, old_signal_mask; uintptr_t old_entry; int rv; @@ -29,6 +30,13 @@ int __rt_sigaction(int sig, struct sigaction *act, return -1; } + /* Mask the signal to avoid races on access to its descriptor */ + sigemptyset(&signal_mask); + sigaddset(&amp...

...action + until it is replaced). */ +static struct { + uintptr_t entry; + uintptr_t gp; +} signal_descriptors[_NSIG]; + +__extern int ____rt_sigaction(int, const struct sigaction *, struct sigaction *, + size_t); + +int __rt_sigaction(int sig, struct sigaction *act, + struct sigaction *oact, size_t size) +{ + uintptr_t old_entry; + int rv; + + if (sig < 0 || sig >= _NSIG) { + errno = EINVAL; + return -1; + } + + if (oact) { + old_entry = signal_descriptors[sig].entry; + } + + if (act && act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL) { + signa...

...+ until it is replaced). */ +static struct { + uintptr_t entry; + uintptr_t gp; +} signal_descriptors[_NSIG]; + +__extern int ____rt_sigaction(int, const struct sigaction *, struct sigaction *, + size_t); + +int __rt_sigaction(int sig, const struct sigaction *act, + struct sigaction *oact, size_t size) +{ + uintptr_t old_entry; + int rv; + + if (sig < 0 || sig >= _NSIG) { + errno = EINVAL; + return -1; + } + + if (oact) { + old_entry = signal_descriptors[sig].entry; + } + + if (act && act->sa_handler != SIG_IGN && act->sa_handler != SIG_DFL) { + signa...

...nt, const struct sigaction *, struct sigaction *, - size_t, void *); + size_t, void (*)(void)); #else __extern int __rt_sigaction(int, const struct sigaction *, struct sigaction *, size_t); @@ -60,7 +60,7 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) rv = __rt_sigaction(sig, act, oact, restorer, sizeof(sigset_t)); } # elif defined(__alpha__) - rv = __rt_sigaction(sig, act, oact, sizeof(sigset_t), NULL); + rv = __rt_sigaction(sig, act, oact, sizeof(sigset_t), &__sigreturn); # else rv = __rt_sigaction(sig, act, oact, sizeof(sigset_t...

..._) +__extern int __rt_sigaction(int, const struct sigaction *, struct sigaction *, + size_t, void *); #else __extern int __rt_sigaction(int, const struct sigaction *, struct sigaction *, size_t); @@ -43,6 +46,8 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) : NULL; rv = __rt_sigaction(sig, act, oact, restorer, sizeof(sigset_t)); } +# elif defined(__alpha__) + rv = __rt_sigaction(sig, act, oact, sizeof(sigset_t), NULL); # else rv = __rt_sigaction(sig, act, oact, sizeof(sigset_t)); # endif

Hi, is there a DD-accessible porterbox somewhere (slow would be ok, as this is smallish software) with an up-to-date sid (enough to install the recently-built libklibc-dev 2.0~rc5-1 and all other B-D of mksh 40.9.20120518-1, as well as strace and gdb-minimal)? Similarily to http://www.zytor.com/pipermail/klibc/2012-May/003229.html I found klibc-compiled programmes on Alpha to fail (SIGSEGV

...100644 --- a/usr/klibc/sigaction.c +++ b/usr/klibc/sigaction.c @@ -3,6 +3,7 @@ */ #include <signal.h> +#include <stddef.h> #include <sys/syscall.h> #include <klibc/sysconfig.h> @@ -38,6 +39,13 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) #endif #if _KLIBC_USE_RT_SIG + /* Check that we have the right signal API definitions */ + (void)sizeof(char[_NSIG >= 64 ? 1 : -1]); + (void)sizeof(char[sizeof(sigset_t) * 8 >= _NSIG ? 1 : -1]); + (void)sizeof(char[offsetof(struct sigaction, sa_mask) + + sizeof(sigset_t) == sizeof(st...

...ef _KLIBC_NEEDS_SA_RESTORER # define _KLIBC_NEEDS_SA_RESTORER 0 diff --git a/usr/klibc/sigaction.c b/usr/klibc/sigaction.c index 30ef39ef..966bc1c6 100644 --- a/usr/klibc/sigaction.c +++ b/usr/klibc/sigaction.c @@ -31,8 +31,6 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) sa = *act; act = &sa; - /* The kernel can't be trusted to have a valid default - restorer */ sa.sa_flags |= SA_RESTORER; sa.sa_restorer = &__sigreturn; }

...ibc/sigaction.c b/usr/klibc/sigaction.c index 966bc1c6..0d7c5c9d 100644 --- a/usr/klibc/sigaction.c +++ b/usr/klibc/sigaction.c @@ -22,19 +22,26 @@ __extern int __rt_sigaction(int, const struct sigaction *, struct sigaction *, int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) { - int rv; - + unsigned int needed_flags = 0 #if _KLIBC_NEEDS_SA_RESTORER + | SA_RESTORER +#endif +#if _KLIBC_NEEDS_SA_SIGINFO + | SA_SIGINFO +#endif + ; struct sigaction sa; + int rv; - if (act && !(act->sa_flags & SA_RESTORER)) { + if (act && (act->sa_flags &a...

...GACTION_FIXUP 0 +#endif + + /* * _KLIBC_STATFS_F_TYPE_64: * diff --git a/usr/klibc/sigaction.c b/usr/klibc/sigaction.c index d2223843..ed4cf5b5 100644 --- a/usr/klibc/sigaction.c +++ b/usr/klibc/sigaction.c @@ -28,7 +28,9 @@ int sigaction(int sig, const struct sigaction *act, struct sigaction *oact) struct sigaction sa; int rv; - if (act && (act->sa_flags & needed_flags) != needed_flags) { + if (act && + ((act->sa_flags & needed_flags) != needed_flags || + _KLIBC_NEEDS_SIGACTION_FIXUP)) { sa = *act; sa.sa_flags |= needed_flags; #if _KLIBC_NE...

i''ll need to have a virtal server, but why i can do this?