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

Return EINVAL in case of incorrect sigev_signo value specified instead of panicing.

Browse Source
This commit is contained in:
Dmitry Chagin 2015-12-26 09:09:49 +00:00
parent 6e5549717a
commit bfb5568a3c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/compat/linux/linux_timer.c
View File

@ -57,6 +57,8 @@ linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
CP(*l_sig, *sig, sigev_notify); CP(*l_sig, *sig, sigev_notify);
switch (l_sig->sigev_notify) { switch (l_sig->sigev_notify) {
case L_SIGEV_SIGNAL: case L_SIGEV_SIGNAL:
if (!LINUX_SIG_VALID(l_sig->sigev_signo))
return (EINVAL);
sig->sigev_notify = SIGEV_SIGNAL; sig->sigev_notify = SIGEV_SIGNAL;
sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo); sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo);
PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr); PTRIN_CP(*l_sig, *sig, sigev_value.sival_ptr);
@ -73,6 +75,8 @@ linux_convert_l_sigevent(struct l_sigevent *l_sig, struct sigevent *sig)
return (EINVAL); return (EINVAL);
#endif #endif
case L_SIGEV_THREAD_ID: case L_SIGEV_THREAD_ID:
if (!LINUX_SIG_VALID(l_sig->sigev_signo))
return (EINVAL);
sig->sigev_notify = SIGEV_THREAD_ID; sig->sigev_notify = SIGEV_THREAD_ID;
CP2(*l_sig, *sig, _l_sigev_un._tid, sigev_notify_thread_id); CP2(*l_sig, *sig, _l_sigev_un._tid, sigev_notify_thread_id);
sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo); sig->sigev_signo = linux_to_bsd_signal(l_sig->sigev_signo);