fix restrict violations in internal use of several functions

The old/new parameters to pthread_sigmask, sigprocmask, and setitimer
are marked restrict, so passing the same address to both is
prohibited. Modify callers of these functions to use a separate object
for each argument.

diff --git a/src/aio/lio_listio.c b/src/aio/lio_listio.c
index 7b6a03d3c1f7d1edf3197c53d19146dd0563dc2b..0799c15d8b16f362eb3f5d5b813c23f124c214a2 100644 (file)
--- a/src/aio/lio_listio.c
+++ b/src/aio/lio_listio.c
@@ -113,7 +113,7 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
 
        if (st) {
                pthread_attr_t a;
-               sigset_t set;
+               sigset_t set, set_old;
                pthread_t td;
 
                if (sev->sigev_notify == SIGEV_THREAD) {
@@ -128,13 +128,13 @@ int lio_listio(int mode, struct aiocb *restrict const *restrict cbs, int cnt, st
                }
                pthread_attr_setdetachstate(&a, PTHREAD_CREATE_DETACHED);
                sigfillset(&set);
-               pthread_sigmask(SIG_BLOCK, &set, &set);
+               pthread_sigmask(SIG_BLOCK, &set, &set_old);
                if (pthread_create(&td, &a, wait_thread, st)) {
                        free(st);
                        errno = EAGAIN;
                        return -1;
                }
-               pthread_sigmask(SIG_SETMASK, &set, 0);
+               pthread_sigmask(SIG_SETMASK, &set_old, 0);
        }
 
        return 0;

diff --git a/src/signal/sigset.c b/src/signal/sigset.c
index 0d7b4564677b8f18d0b10979eb937086cd952007..f3e8c4077ec27c5eaf2f23bdf79f6f4491917eff 100644 (file)
--- a/src/signal/sigset.c
+++ b/src/signal/sigset.c
@@ -3,7 +3,7 @@
 void (*sigset(int sig, void (*handler)(int)))(int)
 {
        struct sigaction sa, sa_old;
-       sigset_t mask;
+       sigset_t mask, mask_old;
 
        sigemptyset(&mask);
        if (sigaddset(&mask, sig) < 0)
@@ -12,7 +12,7 @@ void (*sigset(int sig, void (*handler)(int)))(int)
        if (handler == SIG_HOLD) {
                if (sigaction(sig, 0, &sa_old) < 0)
                        return SIG_ERR;
-               if (sigprocmask(SIG_BLOCK, &mask, &mask) < 0)
+               if (sigprocmask(SIG_BLOCK, &mask, &mask_old) < 0)
                        return SIG_ERR;
        } else {
                sa.sa_handler = handler;
@@ -20,8 +20,8 @@ void (*sigset(int sig, void (*handler)(int)))(int)
                sigemptyset(&sa.sa_mask);
                if (sigaction(sig, &sa, &sa_old) < 0)
                        return SIG_ERR;
-               if (sigprocmask(SIG_UNBLOCK, &mask, &mask) < 0)
+               if (sigprocmask(SIG_UNBLOCK, &mask, &mask_old) < 0)
                        return SIG_ERR;
        }
-       return sigismember(&mask, sig) ? SIG_HOLD : sa_old.sa_handler;
+       return sigismember(&mask_old, sig) ? SIG_HOLD : sa_old.sa_handler;
 }

diff --git a/src/unistd/ualarm.c b/src/unistd/ualarm.c
index 855504bca42c743580fbbb3425a3176736411c7a..2985855c72afd3e4b88fca07a1179634b1bf1af6 100644 (file)
--- a/src/unistd/ualarm.c
+++ b/src/unistd/ualarm.c
@@ -7,7 +7,7 @@ unsigned ualarm(unsigned value, unsigned interval)
        struct itimerval it = {
                .it_interval.tv_usec = interval,
                .it_value.tv_usec = value
-       };
-       setitimer(ITIMER_REAL, &it, &it);
-       return it.it_value.tv_sec*1000000 + it.it_value.tv_usec;
+       }, it_old;
+       setitimer(ITIMER_REAL, &it, &it_old);
+       return it_old.it_value.tv_sec*1000000 + it_old.it_value.tv_usec;
 }