svn commit: r330527 - head/sys/kern

[Brooks Davis]

Author: brooks
Date: Tue Mar  6 01:52:04 2018
New Revision: 330527
URL: https://svnweb.freebsd.org/changeset/base/330527

Log:
  Use umtx_copyin_umtx_time32() in __umtx_op_lock_umutex_compat32().
  
  Non-NULL timeouts where copied in improperly and could produce failures
  due to incompatible data structures.
  
  Reviewed by:	kib
  MFC after:	3 days
  Sponsored by:	DARPA, AFRL
  Differential Revision:	https://reviews.freebsd.org/D14587

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Mon Mar  5 23:51:29 2018	(r330526)
+++ head/sys/kern/kern_umtx.c	Tue Mar  6 01:52:04 2018	(r330527)
@@ -4118,7 +4118,7 @@ __umtx_op_lock_umutex_compat32(struct thread *td, stru
 	if (uap->uaddr2 == NULL)
 		tm_p = NULL;
 	else {
-		error = umtx_copyin_umtx_time(uap->uaddr2,
+		error = umtx_copyin_umtx_time32(uap->uaddr2,
 			    (size_t)uap->uaddr1, &timeout);
 		if (error != 0)
 			return (error);