From owner-svn-src-head@FreeBSD.ORG  Wed Dec 15 19:30:45 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4A5DA1065670;
	Wed, 15 Dec 2010 19:30:45 +0000 (UTC) (envelope-from mdf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 38DCA8FC12;
	Wed, 15 Dec 2010 19:30:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBFJUjv0080672;
	Wed, 15 Dec 2010 19:30:45 GMT (envelope-from mdf@svn.freebsd.org)
Received: (from mdf@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFJUjw2080670;
	Wed, 15 Dec 2010 19:30:45 GMT (envelope-from mdf@svn.freebsd.org)
Message-Id: <201012151930.oBFJUjw2080670@svn.freebsd.org>
From: Matthew D Fleming <mdf@FreeBSD.org>
Date: Wed, 15 Dec 2010 19:30:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216463 - head/sys/kern
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2010 19:30:45 -0000

Author: mdf
Date: Wed Dec 15 19:30:44 2010
New Revision: 216463
URL: http://svn.freebsd.org/changeset/base/216463

Log:
  One of the compat32 functions was copying in a raw timespec, instead of
  a 32-bit one.  This can cause weird timeout issues, as the copying reads
  garbage from the user.
  
  Code by:     Deepak Veliath <deepak dot veliath at isilon dot com>
  MFC after:   1 week

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Wed Dec 15 16:49:47 2010	(r216462)
+++ head/sys/kern/kern_umtx.c	Wed Dec 15 19:30:44 2010	(r216463)
@@ -3411,8 +3411,7 @@ __umtx_op_rw_rdlock_compat32(struct thre
 	if (uap->uaddr2 == NULL) {
 		error = do_rw_rdlock(td, uap->obj, uap->val, 0);
 	} else {
-		error = copyin(uap->uaddr2, &timeout,
-		    sizeof(timeout));
+		error = copyin_timeout32(uap->uaddr2, &timeout);
 		if (error != 0)
 			return (error);
 		if (timeout.tv_nsec >= 1000000000 ||