From: Lena Djokic <Lena.Djokic@rt-rk.com>
Date: Thu, 24 Nov 2016 16:08:56 +0000 (+0100)
Subject: linux-user: Fix readahead
X-Git-Tag: v2.9.0-rc0~92^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=77c6850fd7412289122bc21f3b01310c014d98d4;p=thirdparty%2Fqemu.git

linux-user: Fix readahead

Calculation of 64-bit offset was not correct for all cases.

Signed-off-by: Lena Djokic <Lena.Djokic@rt-rk.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fccd6312adc..3e88dd129cf 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11228,7 +11228,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
             arg3 = arg4;
             arg4 = arg5;
         }
-        ret = get_errno(readahead(arg1, ((off64_t)arg3 << 32) | arg2, arg4));
+        ret = get_errno(readahead(arg1, target_offset64(arg2, arg3) , arg4));
 #else
         ret = get_errno(readahead(arg1, arg2, arg3));
 #endif