Accepting request 666320 from home:lyan:branches:Virtualization
Fix pwrite64/pread64 to return 0 over -1 for a zero length NULL buffer in qemu OBS-URL: https://build.opensuse.org/request/show/666320 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=448
This commit is contained in:
Bruce Rogers
Git OBS Bridge
parent
2b7c253ce4
commit
341ad4da29
68
0054-linux-user-make-pwrite64-pread64-fd.patch
Normal file
68
0054-linux-user-make-pwrite64-pread64-fd.patch
Normal file
@ -0,0 +1,68 @@
|
||||
From: Peter Maydell <peter.maydell@linaro.org>
|
||||
Date: Tue, 8 Jan 2019 18:49:00 +0000
|
||||
Subject: linux-user: make pwrite64/pread64(fd, NULL, 0, offset) return 0
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Linux returns success if pwrite64() or pread64() are called with a
|
||||
zero length NULL buffer, but QEMU was returning -TARGET_EFAULT.
|
||||
|
||||
This is the same bug that we fixed in commit 58cfa6c2e6eb51b23cc9
|
||||
for the write syscall, and long before that in 38d840e6790c29f59
|
||||
for the read syscall.
|
||||
|
||||
Fixes: https://bugs.launchpad.net/qemu/+bug/1810433
|
||||
|
||||
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
|
||||
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
|
||||
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
|
||||
Message-Id: <20190108184900.9654-1-peter.maydell@linaro.org>
|
||||
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
||||
(cherry picked from commit 2bd3f8998e1e7dcd9afc29fab252fb9936f9e956)
|
||||
[LY: BSC#1121600]
|
||||
Signed-off-by: Liang Yan <lyan@suse.com>
|
||||
---
|
||||
linux-user/syscall.c | 22 ++++++++++++++++++----
|
||||
1 file changed, 18 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
||||
index d978c67d6b..4d3b98c6f7 100644
|
||||
--- a/linux-user/syscall.c
|
||||
+++ b/linux-user/syscall.c
|
||||
@@ -9723,8 +9723,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1,
|
||||
arg4 = arg5;
|
||||
arg5 = arg6;
|
||||
}
|
||||
- if (!(p = lock_user(VERIFY_WRITE, arg2, arg3, 0)))
|
||||
- return -TARGET_EFAULT;
|
||||
+ if (arg2 == 0 && arg3 == 0) {
|
||||
+ /* Special-case NULL buffer and zero length, which should succeed */
|
||||
+ p = 0;
|
||||
+ } else {
|
||||
+ p = lock_user(VERIFY_WRITE, arg2, arg3, 0);
|
||||
+ if (!p) {
|
||||
+ return -TARGET_EFAULT;
|
||||
+ }
|
||||
+ }
|
||||
ret = get_errno(pread64(arg1, p, arg3, target_offset64(arg4, arg5)));
|
||||
unlock_user(p, arg2, ret);
|
||||
return ret;
|
||||
@@ -9733,8 +9740,15 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_ulong arg1,
|
||||
arg4 = arg5;
|
||||
arg5 = arg6;
|
||||
}
|
||||
- if (!(p = lock_user(VERIFY_READ, arg2, arg3, 1)))
|
||||
- return -TARGET_EFAULT;
|
||||
+ if (arg2 == 0 && arg3 == 0) {
|
||||
+ /* Special-case NULL buffer and zero length, which should succeed */
|
||||
+ p = 0;
|
||||
+ } else {
|
||||
+ p = lock_user(VERIFY_READ, arg2, arg3, 1);
|
||||
+ if (!p) {
|
||||
+ return -TARGET_EFAULT;
|
||||
+ }
|
||||
+ }
|
||||
ret = get_errno(pwrite64(arg1, p, arg3, target_offset64(arg4, arg5)));
|
||||
unlock_user(p, arg2, 0);
|
||||
return ret;
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 15 13:58:26 UTC 2019 - Liang Yan <lyan@suse.com>
|
||||
|
||||
- Fix pwrite64/pread64 to return 0 over -1 for a
|
||||
zero length NULL buffer in qemu (bsc#1121600)
|
||||
0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jan 10 18:03:30 UTC 2019 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
|
||||
@ -85,6 +85,7 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
|
||||
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
|
||||
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
|
||||
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
|
||||
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
# Please do not add QEMU patches manually here.
|
||||
# Run update_git.sh to regenerate this queue.
|
||||
ExcludeArch: s390
|
||||
@ -169,6 +170,7 @@ syscall layer occurs on the native hardware and operating system.
|
||||
%patch0051 -p1
|
||||
%patch0052 -p1
|
||||
%patch0053 -p1
|
||||
%patch0054 -p1
|
||||
|
||||
%build
|
||||
./configure \
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
|
||||
* Patches added:
|
||||
0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
(bsc#1121600)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 14 16:15:37 UTC 2019 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
|
||||
@ -190,6 +190,7 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
|
||||
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
|
||||
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
|
||||
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
|
||||
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
# Please do not add QEMU patches manually here.
|
||||
# Run update_git.sh to regenerate this queue.
|
||||
|
||||
@ -971,6 +972,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch0051 -p1
|
||||
%patch0052 -p1
|
||||
%patch0053 -p1
|
||||
%patch0054 -p1
|
||||
|
||||
pushd roms/seabios
|
||||
%patch1100 -p1
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 15 13:58:25 UTC 2019 - Liang Yan <lyan@suse.com>
|
||||
|
||||
- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1
|
||||
* Patches added:
|
||||
0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
(bsc#1121600)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jan 14 16:15:37 UTC 2019 - Bruce Rogers <brogers@suse.com>
|
||||
|
||||
|
||||
@ -190,6 +190,7 @@ Patch0050: 0050-pvrdma-check-number-of-pages-when-c.patch
|
||||
Patch0051: 0051-pvrdma-check-return-value-from-pvrd.patch
|
||||
Patch0052: 0052-pvrdma-release-ring-object-in-case-.patch
|
||||
Patch0053: 0053-block-Fix-hangs-in-synchronous-APIs.patch
|
||||
Patch0054: 0054-linux-user-make-pwrite64-pread64-fd.patch
|
||||
# Please do not add QEMU patches manually here.
|
||||
# Run update_git.sh to regenerate this queue.
|
||||
|
||||
@ -971,6 +972,7 @@ This package provides a service file for starting and stopping KSM.
|
||||
%patch0051 -p1
|
||||
%patch0052 -p1
|
||||
%patch0053 -p1
|
||||
%patch0054 -p1
|
||||
|
||||
pushd roms/seabios
|
||||
%patch1100 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user