about summary refs log tree commit diff
path: root/nptl/sysdeps/unix/sysv/linux/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-06-18 04:29:42 +0000
committerUlrich Drepper <drepper@redhat.com>2004-06-18 04:29:42 +0000
commit7c3164bc6650ceeecd67841dfb8fcf399d12a93f (patch)
tree23a7016e21d2848ec2d3fdfa1b8dc1abcf3e85d4 /nptl/sysdeps/unix/sysv/linux/i386
parent72e615009bfde798692487d04ae548d15eb423ba (diff)
downloadglibc-7c3164bc6650ceeecd67841dfb8fcf399d12a93f.tar.gz
glibc-7c3164bc6650ceeecd67841dfb8fcf399d12a93f.tar.xz
glibc-7c3164bc6650ceeecd67841dfb8fcf399d12a93f.zip
Update.
2004-06-17  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/pthread/pthread_cond_timedwait.c
	(__pthread_cond_timedwait): Also check for negativ nanoseconds.
	* sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
	(__pthread_cond_timedwait): Check for invalid nanosecond in
	timeout value.
	* sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S: Likewise.
	* tst-cond19.c: New file.
	* Makefile: Add rules to build and run tst-cond19.
Diffstat (limited to 'nptl/sysdeps/unix/sysv/linux/i386')
-rw-r--r--nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
index 305fa4d5d7..1d24b1a1e1 100644
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
@@ -55,6 +55,10 @@ __pthread_cond_timedwait:
 	movl	20(%esp), %ebx
 	movl	28(%esp), %ebp
 
+	cmpl	$1000000000, 4(%ebp)
+	movl	$EINVAL, %eax
+	jae	18f
+
 	/* Get internal lock.  */
 	movl	$1, %edx
 	xorl	%eax, %eax