Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- use itimespecfix to detect invalid timespecs

Browse Source 
- use tstohz instead of mstohz to prevent overflow.
This commit is contained in:
christos 2009-03-29 17:54:12 +00:00
parent dba4444474
commit 6e1db6cea1
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sys/kern/sys_sig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: sys_sig.c,v 1.22 2009/03/29 16:23:23 christos Exp $ */
/* $NetBSD: sys_sig.c,v 1.23 2009/03/29 17:54:12 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@ -66,7 +66,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.22 2009/03/29 16:23:23 christos Exp $");
__KERNEL_RCSID(0, "$NetBSD: sys_sig.c,v 1.23 2009/03/29 17:54:12 christos Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@ -644,17 +644,16 @@ __sigtimedwait1(struct lwp *l, const struct sys_____sigtimedwait50_args *uap,
* Calculate timeout, if it was specified.
*/
if (SCARG(uap, timeout)) {
uint64_t ms;
error = (*fetch_timeout)(SCARG(uap, timeout), &ts, sizeof(ts));
if (error)
return error;
if ((error = (*fetch_timeout)(SCARG(uap, timeout), &ts, sizeof(ts))))
return (error);
if ((error = itimespecfix(&ts)) != 0)
return error;
ms = (ts.tv_sec * 1000) + (ts.tv_nsec / 1000000);
timo = mstohz(ms);
if (timo == 0 && ts.tv_sec == 0 && ts.tv_nsec > 0)
timo = 1;
if (timo <= 0)
return EINVAL;
timo = tstohz(&ts);
if (timo == 0 && ts.tv_sec == 0 && ts.tv_nsec != 0)
timo++;
/*
* Remember current uptime, it would be used in