Package: release.debian.org Severity: normal Tags: trixie X-Debbugs-Cc: [email protected], [email protected] Control: affects -1 + src:qemu User: [email protected] Usertags: pu
[ Reason ] There's a single change in this debian release of qemu, which fixes #1119257 - wrong emulation in qemu-user of two ioctls. The problem existed since the day one of qemu-user, but it's been revealed when debian tried to provide cloud images of big endian architectures (notable s390x). The patch is already applied to the upstream qemu master branch and picked up for active qemu stable series, it will be part of next qemu stable release (and will be in next qemu update in debian too). It'd be nice to have this update before the next- to-next trixie point release, so that the cloud team can do their work. [ Tests, Risks ] The change is very small and focused, and the result for the two ioctls in question agrees with the kernel finally. There's no risks this time. [ Checklist ] [x] *all* changes are documented in the d/changelog [x] I reviewed all changes and I approve them [x] attach debdiff against the package in (old)stable [x] the issue is verified as fixed in unstable [ Other info ] There's one more change which does not affect packaging - in the previous changelog entry I mentioned closing of an unrelated bug#, which I now removed. Thanks, /mjt diff -Nru qemu-10.0.6+ds/debian/changelog qemu-10.0.6+ds/debian/changelog --- qemu-10.0.6+ds/debian/changelog 2025-09-10 09:50:46.000000000 +0300 +++ qemu-10.0.6+ds/debian/changelog 2025-11-04 16:40:44.000000000 +0300 @@ -1,3 +1,15 @@ +qemu (1:10.0.6+ds-0+deb13u2) trixie; urgency=medium + + * d/changelog: remove wrong closes: #1095935 from the previous changelog + entry (and reopen the bug): I confused it with another bug + * linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch - add a patch + from upstream stable series (before next stable release) - fix wrong + emulation of FIBMAP and FIGETBSZ ioctls. Needed for s390x cloud images. + Will be in next upstream stable release, so will be removed in next debian. + (Closes: #1119257) + + -- Michael Tokarev <[email protected]> Tue, 04 Nov 2025 16:40:44 +0300 + qemu (1:10.0.6+ds-0+deb13u1) trixie; urgency=medium * new upstream stable/bugfix release: @@ -147,7 +159,6 @@ - i386/cpu: Move adjustment of CPUID_EXT_PDCM before feature_dependencies[] check - Revert "i386/cpu: Fix cpu number overflow in CPUID.01H.EBX[23:16]" - (The 5 changes above Closes: #1095935 in 10.0.x) - qga: correctly write to /sys/power/state on linux (Closes: #1108387) - scripts/make-release: Go back to cloning all the EDK2 submodules diff -Nru qemu-10.0.6+ds/debian/patches/linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch qemu-10.0.6+ds/debian/patches/linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch --- qemu-10.0.6+ds/debian/patches/linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch 1970-01-01 03:00:00.000000000 +0300 +++ qemu-10.0.6+ds/debian/patches/linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch 2025-11-04 15:42:33.000000000 +0300 @@ -0,0 +1,49 @@ +From: Bastian Blank <[email protected]> +Date: Tue, 28 Oct 2025 13:16:12 +0100 +Subject: linux-user: Use correct type for FIBMAP and FIGETBSZ emulation +Origin: upstream, https://gitlab.com/qemu-project/qemu/-/commit/7c7089321670fb51022a1c4493cbcc69aa288a0f +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/1119257 + +Both the FIBMAP and FIGETBSZ ioctl get "int *" (pointer to 32bit +integer) as argument, not "long *" as specified in qemu. Using the +correct type makes the emulation work in cross endian context. + +Both ioctl does not seem to be documented. However the kernel +implementation has always used "int *". + +Signed-off-by: Bastian Blank <[email protected]> +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/3185 +Reviewed-by: Peter Maydell <[email protected]> +Reviewed-by: Helge Deller <[email protected]> +Reviwed-by: Michael Tokarev <[email protected]> +Signed-off-by: Michael Tokarev <[email protected]> +--- + linux-user/ioctls.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h +index 3b41128fd7..2f62fd2cb9 100644 +--- a/linux-user/ioctls.h ++++ b/linux-user/ioctls.h +@@ -130,7 +130,7 @@ + IOCTL(FDTWADDLE, 0, TYPE_NULL) + IOCTL(FDEJECT, 0, TYPE_NULL) + +- IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG)) ++ IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_INT)) + #ifdef FICLONE + IOCTL(FICLONE, IOC_W, TYPE_INT) + IOCTL(FICLONERANGE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_file_clone_range))) +@@ -145,7 +145,7 @@ + IOCTL(FITRIM, IOC_W | IOC_R, MK_PTR(MK_STRUCT(STRUCT_fstrim_range))) + #endif + +- IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_LONG)) ++ IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_INT)) + #ifdef CONFIG_FIEMAP + IOCTL_SPECIAL(FS_IOC_FIEMAP, IOC_W | IOC_R, do_ioctl_fs_ioc_fiemap, + MK_PTR(MK_STRUCT(STRUCT_fiemap))) +-- +2.47.3 + diff -Nru qemu-10.0.6+ds/debian/patches/series qemu-10.0.6+ds/debian/patches/series --- qemu-10.0.6+ds/debian/patches/series 2025-09-10 09:50:46.000000000 +0300 +++ qemu-10.0.6+ds/debian/patches/series 2025-11-04 15:45:12.000000000 +0300 @@ -15,3 +15,4 @@ slof-ensure-ld-is-called-with-C-locale.patch qemu-img-options.patch disable-pycotap.patch +linux-user-use-correct-type-for-FIBMAP-and-FIGETBSZ.patch
