diff -Nru qemu-6.2+dfsg/debian/changelog qemu-6.2+dfsg/debian/changelog --- qemu-6.2+dfsg/debian/changelog 2022-01-05 11:18:25.000000000 +0000 +++ qemu-6.2+dfsg/debian/changelog 2022-01-05 11:18:25.000000000 +0000 @@ -1,4 +1,4 @@ -qemu (1:6.2+dfsg-2ubuntu1~jammyppa10) jammy; urgency=medium +qemu (1:6.2+dfsg-2ubuntu1~jammyppa11) jammy; urgency=medium * Merge with Debian unstable, remaining changes: - qemu-kvm to systemd unit @@ -61,6 +61,7 @@ - d/p/u/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch Allow long kernel command lines for QEMU (LP: #1959984) - d/kvm-spice: fix when acceleration is already defined on the commandline + - d/p/u/fix-virtiofsd-for-glibc2.35.patch: add rseq to seccomp allow list -- Christian Ehrhardt Wed, 05 Jan 2022 12:18:25 +0100 diff -Nru qemu-6.2+dfsg/debian/patches/series qemu-6.2+dfsg/debian/patches/series --- qemu-6.2+dfsg/debian/patches/series 2022-01-05 11:18:25.000000000 +0000 +++ qemu-6.2+dfsg/debian/patches/series 2022-01-05 11:18:25.000000000 +0000 @@ -25,3 +25,4 @@ ubuntu/avoid-fcf-clashing-with-i486.patch ubuntu/lp-1952448-relax-skiboot-gcc-deprecation-errors.patch ubuntu/lp-1959984-s390x-ipl-support-extended-kernel-command-line-size.patch +ubuntu/fix-virtiofsd-for-glibc2.35.patch diff -Nru qemu-6.2+dfsg/debian/patches/ubuntu/fix-virtiofsd-for-glibc2.35.patch qemu-6.2+dfsg/debian/patches/ubuntu/fix-virtiofsd-for-glibc2.35.patch --- qemu-6.2+dfsg/debian/patches/ubuntu/fix-virtiofsd-for-glibc2.35.patch 1970-01-01 00:00:00.000000000 +0000 +++ qemu-6.2+dfsg/debian/patches/ubuntu/fix-virtiofsd-for-glibc2.35.patch 2022-01-05 11:18:25.000000000 +0000 @@ -0,0 +1,22 @@ +Description: fix virtiofsd seccomp with libc 2.35 + libc 2.35 added an reseq call to every thread creation [1][2] and + therefore needs to be allowed or virtiofsd will exit with + "Bad system call (core dumped)" when a guest connects. + . + [1]: https://www.efficios.com/blog/2019/02/08/linux-restartable-sequences/ + [2]: https://sourceware.org/pipermail/libc-alpha/2022-February/136040.html +Forwarded: yes +Author: Christian Ehrhardt +Last-Update: 2022-02-09 +--- a/tools/virtiofsd/passthrough_seccomp.c ++++ b/tools/virtiofsd/passthrough_seccomp.c +@@ -116,6 +116,9 @@ static const int syscall_allowlist[] = { + SCMP_SYS(write), + SCMP_SYS(writev), + SCMP_SYS(umask), ++#ifdef __NR_rseq ++ SCMP_SYS(rseq), /* required since glibc 2.35 */ ++#endif + }; + + /* Syscalls used when --syslog is enabled */