jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix type of extended argument array to pselect6 syscall

Browse source 
this only matters on x32 (and perhaps future 32-on-64 abis for other
archs); otherwise the type is long anyway. the cast through uintptr_t
prevents nonsensical "sign extension" of pointers, and follows the
principle that uintptr_t is the canonical integer type to which
pointer conversion is safe.
This commit is contained in:
Rich Felker 2014-05-26 21:26:46 -04:00
commit 4ef04a27c7
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/select/pselect.c
View file

@ -1,11 +1,12 @@
#include <sys/select.h> #include <sys/select.h>
#include <signal.h> #include <signal.h>
#include <stdint.h>
#include "syscall.h" #include "syscall.h"
#include "libc.h" #include "libc.h"
int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask) int pselect(int n, fd_set *restrict rfds, fd_set *restrict wfds, fd_set *restrict efds, const struct timespec *restrict ts, const sigset_t *restrict mask)
{ {
long data[2] = { (long)mask, _NSIG/8 }; syscall_arg_t data[2] = { (uintptr_t)mask, _NSIG/8 };
struct timespec ts_tmp; struct timespec ts_tmp;
if (ts) ts_tmp = *ts; if (ts) ts_tmp = *ts;
return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data); return syscall_cp(SYS_pselect6, n, rfds, wfds, efds, ts ? &ts_tmp : 0, data);