From cfef1a70bee9e894d4802228967d95f3ec614b06f9fc5b367447c0d3c9602650 Mon Sep 17 00:00:00 2001 From: Bruce Rogers Date: Thu, 17 Jan 2019 22:15:55 +0000 Subject: [PATCH] Accepting request 666837 from home:bfrogers:branches:Virtualization Tweak Xen interface to be compatible with upcoming v4.12 Xen. Also add CVE ref to two patches which were missing it. OBS-URL: https://build.opensuse.org/request/show/666837 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=449 --- ...-pvrdma-release-device-resources-in-.patch | 2 +- ...-rdma-check-num_sge-does-not-exceed-.patch | 3 +- ...-xen-Add-xen-v4.12-based-xc_domain_c.patch | 31 +++++++++++++++++++ qemu-linux-user.changes | 7 +++++ qemu-linux-user.spec | 2 ++ qemu-testsuite.changes | 7 +++++ qemu-testsuite.spec | 2 ++ qemu.changes | 7 +++++ qemu.spec | 2 ++ 9 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch diff --git a/0047-pvrdma-release-device-resources-in-.patch b/0047-pvrdma-release-device-resources-in-.patch index a9006703..6516a382 100644 --- a/0047-pvrdma-release-device-resources-in-.patch +++ b/0047-pvrdma-release-device-resources-in-.patch @@ -12,7 +12,7 @@ Message-Id: <20181212175817.815-1-ppandit@redhat.com> Reviewed-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum (cherry picked from commit cce648613bc802be1b894227f7fd94d88476ea07) -[BR: BSC#1119437] +[BR: BSC#1119437 CVE-2018-20123] Signed-off-by: Bruce Rogers --- hw/rdma/vmw/pvrdma_main.c | 3 ++- diff --git a/0048-rdma-check-num_sge-does-not-exceed-.patch b/0048-rdma-check-num_sge-does-not-exceed-.patch index 85498a25..f605cdba 100644 --- a/0048-rdma-check-num_sge-does-not-exceed-.patch +++ b/0048-rdma-check-num_sge-does-not-exceed-.patch @@ -12,7 +12,8 @@ Signed-off-by: Prasad J Pandit Reviewed-by: Yuval Shaia Signed-off-by: Marcel Apfelbaum (cherry picked from commit 0e68373cc2b3a063ce067bc0cc3edaf370752890) -[BR: BSC#1119840, modified complete_work() calls to be comp_handler()] +[BR: BSC#1119840 CVE-2018-20124, modified complete_work() calls to be +comp_handler()] Signed-off-by: Bruce Rogers --- hw/rdma/rdma_backend.c | 8 ++++---- diff --git a/0055-xen-Add-xen-v4.12-based-xc_domain_c.patch b/0055-xen-Add-xen-v4.12-based-xc_domain_c.patch new file mode 100644 index 00000000..d86a1c56 --- /dev/null +++ b/0055-xen-Add-xen-v4.12-based-xc_domain_c.patch @@ -0,0 +1,31 @@ +From: Bruce Rogers +Date: Thu, 17 Jan 2019 14:40:10 -0700 +Subject: xen: Add xen v4.12 based xc_domain_create call + +In xen v4.12, the xc_domain_create call parameters changed. + +Signed-off-by: Bruce Rogers +--- + include/hw/xen/xen_common.h | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h +index 93f631e5bf..42b088ae90 100644 +--- a/include/hw/xen/xen_common.h ++++ b/include/hw/xen/xen_common.h +@@ -674,7 +674,15 @@ static inline int xen_domain_create(xc_interface *xc, uint32_t ssidref, + xen_domain_handle_t handle, uint32_t flags, + uint32_t *pdomid) + { ++#if CONFIG_XEN_CTRL_INTERFACE_VERSION < 41200 + return xc_domain_create(xc, ssidref, handle, flags, pdomid, NULL); ++#else ++ struct xen_domctl_createdomain create; ++ create.ssidref = ssidref; ++ memcpy(&(create.handle), handle, sizeof(xen_domain_handle_t)); ++ create.flags = flags; ++ return xc_domain_create(xc, pdomid, &create); ++#endif + } + #endif + #endif diff --git a/qemu-linux-user.changes b/qemu-linux-user.changes index 032600cb..8876690d 100644 --- a/qemu-linux-user.changes +++ b/qemu-linux-user.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 17 21:58:04 UTC 2019 - Bruce Rogers + +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1 +* Patches added: + 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch + ------------------------------------------------------------------- Tue Jan 15 13:58:26 UTC 2019 - Liang Yan diff --git a/qemu-linux-user.spec b/qemu-linux-user.spec index 8be782f5..39ff6f0f 100644 --- a/qemu-linux-user.spec +++ b/qemu-linux-user.spec @@ -86,6 +86,7 @@ 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 +Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. ExcludeArch: s390 @@ -171,6 +172,7 @@ syscall layer occurs on the native hardware and operating system. %patch0052 -p1 %patch0053 -p1 %patch0054 -p1 +%patch0055 -p1 %build ./configure \ diff --git a/qemu-testsuite.changes b/qemu-testsuite.changes index d6fae88d..b77a5e0d 100644 --- a/qemu-testsuite.changes +++ b/qemu-testsuite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers + +- Tweak Xen interface to be compatible with upcoming v4.12 Xen + 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1 + ------------------------------------------------------------------- Tue Jan 15 13:58:25 UTC 2019 - Liang Yan diff --git a/qemu-testsuite.spec b/qemu-testsuite.spec index e524a06a..bcb55d2f 100644 --- a/qemu-testsuite.spec +++ b/qemu-testsuite.spec @@ -191,6 +191,7 @@ 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 +Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -973,6 +974,7 @@ This package provides a service file for starting and stopping KSM. %patch0052 -p1 %patch0053 -p1 %patch0054 -p1 +%patch0055 -p1 pushd roms/seabios %patch1100 -p1 diff --git a/qemu.changes b/qemu.changes index d6fae88d..b77a5e0d 100644 --- a/qemu.changes +++ b/qemu.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jan 17 21:58:02 UTC 2019 - Bruce Rogers + +- Tweak Xen interface to be compatible with upcoming v4.12 Xen + 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch +- Patch queue updated from git://github.com/openSUSE/qemu.git opensuse-3.1 + ------------------------------------------------------------------- Tue Jan 15 13:58:25 UTC 2019 - Liang Yan diff --git a/qemu.spec b/qemu.spec index 995f6a6f..82c05847 100644 --- a/qemu.spec +++ b/qemu.spec @@ -191,6 +191,7 @@ 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 +Patch0055: 0055-xen-Add-xen-v4.12-based-xc_domain_c.patch # Please do not add QEMU patches manually here. # Run update_git.sh to regenerate this queue. @@ -973,6 +974,7 @@ This package provides a service file for starting and stopping KSM. %patch0052 -p1 %patch0053 -p1 %patch0054 -p1 +%patch0055 -p1 pushd roms/seabios %patch1100 -p1