d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux(4): Fix timeout parameter of rt_sigtimedwait syscall, which is

Browse Source 
timespec not a timeval.

MFC after:	2 weeks
This commit is contained in:
Dmitry Chagin 2021-06-07 05:35:35 +03:00
parent 56b187005c
commit 0f8dab4540
6 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/amd64/linux/syscalls.master
View File

@ -839,7 +839,7 @@
int linux_rt_sigtimedwait(
l_sigset_t *mask,
l_siginfo_t *ptr,
struct l_timeval *timeout,
struct l_timespec *timeout,
l_size_t sigsetsize
);
}

2
sys/amd64/linux32/syscalls.master
View File

@ -949,7 +949,7 @@
int linux_rt_sigtimedwait(
l_sigset_t *mask,
l_siginfo_t *ptr,
struct l_timeval *timeout,
struct l_timespec *timeout,
l_size_t sigsetsize
);
}

2
sys/arm/linux/syscalls.master
View File

@ -804,7 +804,7 @@
int linux_rt_sigtimedwait(
l_sigset_t *mask,
l_siginfo_t *ptr,
struct l_timeval *timeout,
struct l_timespec *timeout,
l_size_t sigsetsize
);
}

2
sys/arm64/linux/syscalls.master
View File

@ -829,7 +829,7 @@
int linux_rt_sigtimedwait(
l_sigset_t *mask,
l_siginfo_t *ptr,
struct l_timeval *timeout,
struct l_timespec *timeout,
l_size_t sigsetsize
);
}

30
sys/compat/linux/linux_signal.c
View File

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <machine/../linux/linux_proto.h>
#endif
#include <compat/linux/linux_signal.h>
#include <compat/linux/linux_timer.h>
#include <compat/linux/linux_util.h>
#include <compat/linux/linux_emul.h>
#include <compat/linux/linux_misc.h>
@ -392,9 +393,8 @@ linux_rt_sigtimedwait(struct thread *td,
struct linux_rt_sigtimedwait_args *args)
{
int error, sig;
l_timeval ltv;
struct timeval tv;
struct timespec ts, *tsa;
struct l_timespec lts;
l_sigset_t lset;
sigset_t bset;
l_siginfo_t linfo;
@ -409,27 +409,15 @@ linux_rt_sigtimedwait(struct thread *td,
tsa = NULL;
if (args->timeout) {
if ((error = copyin(args->timeout, &ltv, sizeof(ltv))))
if ((error = copyin(args->timeout, &lts, sizeof(lts))))
return (error);
error = linux_to_native_timespec(&ts, &lts);
if (error != 0)
return (error);
tv.tv_sec = (long)ltv.tv_sec;
tv.tv_usec = (suseconds_t)ltv.tv_usec;
if (itimerfix(&tv)) {
/*
* The timeout was invalid. Convert it to something
* valid that will act as it does under Linux.
*/
tv.tv_sec += tv.tv_usec / 1000000;
tv.tv_usec %= 1000000;
if (tv.tv_usec < 0) {
tv.tv_sec -= 1;
tv.tv_usec += 1000000;
}
if (tv.tv_sec < 0)
timevalclear(&tv);
}
TIMEVAL_TO_TIMESPEC(&tv, &ts);
tsa = &ts;
}
} else
tsa = NULL;
error = kern_sigtimedwait(td, bset, &info, tsa);
if (error)
return (error);

2
sys/i386/linux/syscalls.master
View File

@ -974,7 +974,7 @@
int linux_rt_sigtimedwait(
l_sigset_t *mask,
l_siginfo_t *ptr,
struct l_timeval *timeout,
struct l_timespec *timeout,
l_size_t sigsetsize
);
}