From be4bcd8850997cf9556c329fb10914b294c777e5507344ae81c233a45182bdb8 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Tue, 15 Jan 2019 20:55:09 +0000 Subject: [PATCH] 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 --- ...-linux-user-make-pwrite64-pread64-fd.patch | 68 +++++++++++++++++++ qemu-linux-user.changes | 8 +++ qemu-linux-user.spec | 2 + qemu-testsuite.changes | 8 +++ qemu-testsuite.spec | 2 + qemu.changes | 8 +++ qemu.spec | 2 + 7 files changed, 98 insertions(+) create mode 100644 0054-linux-user-make-pwrite64-pread64-fd.patch diff --git a/0054-linux-user-make-pwrite64-pread64-fd.patch b/0054-linux-user-make-pwrite64-pread64-fd.patch new file mode 100644 index 00000000..bc998673 --- /dev/null +++ b/0054-linux-user-make-pwrite64-pread64-fd.patch @@ -0,0 +1,68 @@ +From: Peter Maydell +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 +Reviewed-by: Laurent Vivier +Reviewed-by: Philippe Mathieu-Daudé +Message-Id: <20190108184900.9654-1-peter.maydell@linaro.org> +Signed-off-by: Laurent Vivier +(cherry picked from commit 2bd3f8998e1e7dcd9afc29fab252fb9936f9e956) +[LY: BSC#1121600] +Signed-off-by: Liang Yan +--- + 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; diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 634d0ad9..032600cb 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 15 13:58:26 UTC 2019 - Liang Yan + +- 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 diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index cdf750ff..8be782f5 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -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 \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index a90c22d1..d6fae88d 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 15 13:58:25 UTC 2019 - Liang Yan + +- 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 diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index ba27d068..e524a06a 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -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 diff --git a/qemu.changes b/qemu.changes index a90c22d1..d6fae88d 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jan 15 13:58:25 UTC 2019 - Liang Yan + +- 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 diff --git a/qemu.spec b/qemu.spec index 22d0482f..995f6a6f 100644 --- a/qemu.spec +++ b/qemu.spec @@ -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