Date: Tue, 11 Jan 2011 17:33:30 +0000 (UTC) From: Matthew D Fleming <mdf@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r217272 - stable/8/sys/kern Message-ID: <201101111733.p0BHXUc5027857@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mdf Date: Tue Jan 11 17:33:29 2011 New Revision: 217272 URL: http://svn.freebsd.org/changeset/base/217272 Log: MFC r216463: 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. Modified: stable/8/sys/kern/kern_umtx.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/kern/kern_umtx.c ============================================================================== --- stable/8/sys/kern/kern_umtx.c Tue Jan 11 17:31:59 2011 (r217271) +++ stable/8/sys/kern/kern_umtx.c Tue Jan 11 17:33:29 2011 (r217272) @@ -3230,8 +3230,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 ||
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201101111733.p0BHXUc5027857>