Merge r7322 (Valid file descriptor argument to llseek system call.)

(What bug # does this fix?)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_3_3_BRANCH@8073

diff --git a/coregrind/m_syswrap/syswrap-linux.c b/coregrind/m_syswrap/syswrap-linux.c
index e276fa5ae0c36e37a0bc6ae43c138802c99e5623..c17f0ef3d93330b6fc29237ab858ec86d5d3556f 100644 (file)
--- a/coregrind/m_syswrap/syswrap-linux.c
+++ b/coregrind/m_syswrap/syswrap-linux.c
@@ -582,7 +582,10 @@ PRE(sys_llseek)
                  unsigned int, fd, unsigned long, offset_high,
                  unsigned long, offset_low, vki_loff_t *, result,
                  unsigned int, whence);
-   PRE_MEM_WRITE( "llseek(result)", ARG4, sizeof(vki_loff_t));
+   if (!ML_(fd_allowed)(ARG1, "llseek", tid, False))
+      SET_STATUS_Failure( VKI_EBADF );
+   else
+      PRE_MEM_WRITE( "llseek(result)", ARG4, sizeof(vki_loff_t));
 }
 POST(sys_llseek)
 {