mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-17 10:26:15 +00:00
Code Issues Releases Activity

Avoid assuming that l_timeval is the same as the native struct timeval

Browse Source 
in linux_select().
This commit is contained in:
Tim J. Robbins 2004-08-15 12:24:05 +00:00
parent 6fa534bad8
commit d1d6dbf120
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=133747
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sys/compat/linux/linux_misc.c
View File

@ -487,6 +487,7 @@ linux_uselib(struct thread *td, struct linux_uselib_args *args)
int int
linux_select(struct thread *td, struct linux_select_args *args) linux_select(struct thread *td, struct linux_select_args *args)
{ {
l_timeval ltv;
struct timeval tv0, tv1, utv, *tvp; struct timeval tv0, tv1, utv, *tvp;
int error; int error;
@ -502,8 +503,10 @@ linux_select(struct thread *td, struct linux_select_args *args)
* time left. * time left.
*/ */
if (args->timeout) { if (args->timeout) {
if ((error = copyin(args->timeout, &utv, sizeof(utv)))) if ((error = copyin(args->timeout, &ltv, sizeof(ltv))))
goto select_out; goto select_out;
utv.tv_sec = ltv.tv_sec;
utv.tv_usec = ltv.tv_usec;
#ifdef DEBUG #ifdef DEBUG
if (ldebug(select)) if (ldebug(select))
printf(LMSG("incoming timeout (%ld/%ld)"), printf(LMSG("incoming timeout (%ld/%ld)"),
@ -566,7 +569,9 @@ linux_select(struct thread *td, struct linux_select_args *args)
printf(LMSG("outgoing timeout (%ld/%ld)"), printf(LMSG("outgoing timeout (%ld/%ld)"),
utv.tv_sec, utv.tv_usec); utv.tv_sec, utv.tv_usec);
#endif #endif
if ((error = copyout(&utv, args->timeout, sizeof(utv)))) ltv.tv_sec = utv.tv_sec;
ltv.tv_usec = utv.tv_usec;
if ((error = copyout(&ltv, args->timeout, sizeof(ltv))))
goto select_out; goto select_out;
} }