Module Name: src
Committed By: kamil
Date: Fri Sep 20 15:16:41 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_select.c
Log Message:
Validate usec ranges in netbsd32___select50()
Later in the code selcommon() checks for proper timespec, check only
correct usec of timeval before type conversions.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/netbsd32/netbsd32_select.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_select.c
diff -u src/sys/compat/netbsd32/netbsd32_select.c:1.19 src/sys/compat/netbsd32/netbsd32_select.c:1.20
--- src/sys/compat/netbsd32/netbsd32_select.c:1.19 Fri Apr 23 15:19:20 2010
+++ src/sys/compat/netbsd32/netbsd32_select.c Fri Sep 20 15:16:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_select.c,v 1.19 2010/04/23 15:19:20 rmind Exp $ */
+/* $NetBSD: netbsd32_select.c,v 1.20 2019/09/20 15:16:41 kamil Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.19 2010/04/23 15:19:20 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_select.c,v 1.20 2019/09/20 15:16:41 kamil Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,6 +68,10 @@ netbsd32___select50(struct lwp *l,
error = copyin(SCARG_P32(uap, tv), &tv32, sizeof(tv32));
if (error != 0)
return error;
+
+ if (tv32.tv_usec < 0 || tv32.tv_usec >= 1000000)
+ return EINVAL;
+
ats.tv_sec = tv32.tv_sec;
ats.tv_nsec = tv32.tv_usec * 1000;
ts = &ats;
