]> git.proxmox.com Git - mirror_qemu.git/commitdiff
linux-user: don't short-circuit read with zero length
authorAndreas Schwab <schwab@suse.de>
Tue, 5 Mar 2019 16:45:05 +0000 (17:45 +0100)
committerLaurent Vivier <laurent@vivier.eu>
Thu, 7 Mar 2019 09:57:29 +0000 (10:57 +0100)
A zero-length read still needs to do the usual checks, thus it may return
errors like EBADF.  This makes the read syscall emulation consistent with
the pread64 syscall emulation.

Signed-off-by: Andreas Schwab <schwab@suse.de>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <mvm5zsxz2we.fsf@suse.de>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
linux-user/syscall.c

index 5f72209debc9ba83f1281ffeaecba0728a95ee90..9f7eb7d7a896894b87db4117b91fd0b1aa20be00 100644 (file)
@@ -7009,8 +7009,8 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
         _exit(arg1);
         return 0; /* avoid warning */
     case TARGET_NR_read:
-        if (arg3 == 0) {
-            return 0;
+        if (arg2 == 0 && arg3 == 0) {
+            return get_errno(safe_read(arg1, 0, 0));
         } else {
             if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
                 return -TARGET_EFAULT;