summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux/avr32/sigaction.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2008-12-01 18:00:04 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2008-12-01 18:00:04 +0000
commit83eb4d5219f920fde59c9edd9204664f0c2f9f36 (patch)
treefd5a550be29c0c45d303cb10ea78b528dbe7978f /libc/sysdeps/linux/avr32/sigaction.c
parent0e4d4dd89170d47a662f1cd0de1b4f3a5dbc1f2d (diff)
fix sigset_t size for mips (it's the only arch with 128 signals).
fix _NSIG for it. better document what's going on in sigaction(). seems to not induce any actual code changes (sans mips).
Diffstat (limited to 'libc/sysdeps/linux/avr32/sigaction.c')
-rw-r--r--libc/sysdeps/linux/avr32/sigaction.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/avr32/sigaction.c b/libc/sysdeps/linux/avr32/sigaction.c
index 05caec7ee..45d0abb5a 100644
--- a/libc/sysdeps/linux/avr32/sigaction.c
+++ b/libc/sysdeps/linux/avr32/sigaction.c
@@ -27,10 +27,14 @@ int __libc_sigaction(int signum, const struct sigaction *act,
{
struct kernel_sigaction kact, koact;
int result;
+ enum {
+ SIGSET_MIN_SIZE = sizeof(kact.sa_mask) < sizeof(act->sa_mask)
+ ? sizeof(kact.sa_mask) : sizeof(act->sa_mask)
+ };
if (act) {
kact.k_sa_handler = act->sa_handler;
- memcpy(&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask));
+ memcpy(&kact.sa_mask, &act->sa_mask, SIGSET_MIN_SIZE);
kact.sa_flags = act->sa_flags;
if (kact.sa_flags & SA_RESTORER)
kact.sa_restorer = act->sa_restorer;
@@ -39,14 +43,16 @@ int __libc_sigaction(int signum, const struct sigaction *act,
kact.sa_flags |= SA_RESTORER;
}
- result = __syscall_rt_sigaction(signum, act ? __ptrvalue(&kact) : NULL,
- oldact ? __ptrvalue(&koact) : NULL,
- _NSIG / 8);
+ /* NB: kernel (as of 2.6.25) will return EINVAL
+ * if sizeof(kact.sa_mask) does not match kernel's sizeof(sigset_t) */
+ result = __syscall_rt_sigaction(signum,
+ act ? __ptrvalue(&kact) : NULL,
+ oldact ? __ptrvalue(&koact) : NULL,
+ sizeof(kact.sa_mask));
if (oldact && result >= 0) {
oldact->sa_handler = koact.k_sa_handler;
- memcpy(&oldact->sa_mask, &koact.sa_mask,
- sizeof(oldact->sa_mask));
+ memcpy(&oldact->sa_mask, &koact.sa_mask, SIGSET_MIN_SIZE);
oldact->sa_flags = koact.sa_flags;
oldact->sa_restorer = koact.sa_restorer;
}