packages/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!485 Automatically generate code patches with openeuler !263 !264

Browse Source 
From: @kuhnchen18 
Reviewed-by: @imxcc 
Signed-off-by: @imxcc
This commit is contained in:
openeuler-ci-bot 2022-03-03 10:05:37 +00:00 committed by Gitee
commit b32e27ba7b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 109 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qemu.spec
View File

@ -1,6 +1,6 @@
Name: qemu
Version: 6.2.0
Release: 22
Release: 23
Epoch: 2
Summary: QEMU is a generic and open source machine emulator and virtualizer
License: GPLv2 and BSD and MIT and CC-BY-SA-4.0
@ -232,6 +232,8 @@ Patch0218: qcow2-fix-memory-leak-in-qcow2_read_extensions.patch
Patch0219: scsi-disk-define-props-in-scsi_block_disk-to-avoid-m.patch
Patch0220: pcie-Add-pcie-root-port-fast-plug-unplug-feature.patch
Patch0221: pcie-Compat-with-devices-which-do-not-support-Link-W.patch
Patch0222: scsi-bus-fix-unmatched-object_unref.patch
Patch0223: tools-virtiofsd-Add-rseq-syscall-to-the-seccomp-allo.patch
BuildRequires: flex
BuildRequires: gcc
@ -679,6 +681,12 @@ getent passwd qemu >/dev/null || \
%endif
%changelog
* Thu Mar 03 2022 Chen Qun <kuhn.chenqun@huawei.com>
- tools/virtiofsd: Add rseq syscall to the seccomp allowlist
* Thu Mar 03 2022 Chen Qun <kuhn.chenqun@huawei.com>
- scsi-bus: fix unmatched object_unref()
* Sat Feb 26 2022 Yan Wang <wangyan122@huawei.com>
- pl011-reset-read-FIFO-when-UARTTIMSC-0-UARTICR-0xfff.patch
- qcow2-fix-memory-leak-in-qcow2_read_extensions.patch

42
scsi-bus-fix-unmatched-object_unref.patch Normal file
View File

@ -0,0 +1,42 @@
From 239ffdcf42e0795b5f025f87fa19ce01642811f2 Mon Sep 17 00:00:00 2001
From: Yan Wang <wangyan122@huawei.com>
Date: Tue, 1 Mar 2022 20:12:12 +0800
Subject: [PATCH] scsi-bus: fix unmatched object_unref()
Fix commit 391dd8f1("scsi-bus: Refactor the code that retries requests"),
which split scsi_dma_restart_bh(), but the object_unref() belongs to
scsi_dma_restart_bh().
So, we should mv object_unref() from scsi_retry_requests() to
scsi_dma_restart_bh().
Signed-off-by: Yan Wang <wangyan122@huawei.com>
---
hw/scsi/scsi-bus.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index 5e6f891b9d..9d37f490ce 100644
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -166,8 +166,6 @@ void scsi_retry_requests(SCSIDevice *s)
scsi_req_unref(req);
}
aio_context_release(blk_get_aio_context(s->conf.blk));
- /* Drop the reference that was acquired in scsi_dma_restart_cb */
- object_unref(OBJECT(s));
}
static void scsi_dma_restart_bh(void *opaque)
@@ -178,6 +176,9 @@ static void scsi_dma_restart_bh(void *opaque)
s->bh = NULL;
scsi_retry_requests(s);
+
+ /* Drop the reference that was acquired in scsi_dma_restart_cb */
+ object_unref(OBJECT(s));
}
void scsi_req_retry(SCSIRequest *req)
--
2.27.0

58
tools-virtiofsd-Add-rseq-syscall-to-the-seccomp-allo.patch Normal file
View File

@ -0,0 +1,58 @@
From 5ca1beec7030b5d9fea36eb4f037d4e0e6c260bd Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Wed, 9 Feb 2022 12:14:56 +0100
Subject: [PATCH] tools/virtiofsd: Add rseq syscall to the seccomp allowlist
The virtiofsd currently crashes when used with glibc 2.35.
That is due to the rseq system call being added to every thread
creation [1][2].
[1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/
[2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html
This happens not at daemon start, but when a guest connects
/usr/lib/qemu/virtiofsd -f --socket-path=/tmp/testvfsd -o sandbox=chroot \
-o source=/var/guests/j-virtiofs --socket-group=kvm
virtio_session_mount: Waiting for vhost-user socket connection...
# start ok, now guest will connect
virtio_session_mount: Received vhost-user socket connection
virtio_loop: Entry
fv_queue_set_started: qidx=0 started=1
fv_queue_set_started: qidx=1 started=1
Bad system call (core dumped)
We have to put rseq on the seccomp allowlist to avoid that the daemon
is crashing in this case.
Reported-by: Michael Hudson-Doyle <michael.hudson@canonical.com>
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Message-id: 20220209111456.3328420-1-christian.ehrhardt@canonical.com
[Moved rseq to its alphabetically ordered position in the seccomp
allowlist.
--Stefan]
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: qinyu <qinyu16@huawei.com>
---
tools/virtiofsd/passthrough_seccomp.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/virtiofsd/passthrough_seccomp.c b/tools/virtiofsd/passthrough_seccomp.c
index a3ce9f898d..2bc0127b69 100644
--- a/tools/virtiofsd/passthrough_seccomp.c
+++ b/tools/virtiofsd/passthrough_seccomp.c
@@ -91,6 +91,9 @@ static const int syscall_allowlist[] = {
SCMP_SYS(renameat2),
SCMP_SYS(removexattr),
SCMP_SYS(restart_syscall),
+#ifdef __NR_rseq
+ SCMP_SYS(rseq), /* required since glibc 2.35 */
+#endif
SCMP_SYS(rt_sigaction),
SCMP_SYS(rt_sigprocmask),
SCMP_SYS(rt_sigreturn),
--
2.27.0