semios/semi-libc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix restrict violations in internal use of several functions

Browse Source 
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.
This commit is contained in:
Samuel Holland
2019-07-10 17:06:00 -04:00
committed by Rich Felker
parent a730639273
commit e0eee3ceef
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/aio/lio_listio.c
+3 -3
View File
@@ -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;
src/signal/sigset.c
+4 -4
View File
@@ -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;
}
src/unistd/ualarm.c
+3 -3
View File
@@ -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;
}