Dario Faggioli
d4b795b3fc
- Fix bsc#1204001. Patches are not upstream, and have been picked up and backported from the ML. This is something we usually prefer to avoid, but this is urgent, and the patches looks fine, with high chances for them to be included as they are (and if they're not, we will revisit this, i.e., drop them and re-include the ones that are actually committed) * Patches added: linux-user-add-more-compat-ioctl-definit.patch linux-user-drop-conditionals-for-obsolet.patch linux-user-remove-conditionals-for-many-.patch meson-enforce-a-minimum-Linux-kernel-hea.patch - Improve the output of update_git.sh, by including the list of repos to which we have downstream patches. - Fix: bsc#1202665, CVE-2022-2962 * Patches added: net-tulip-Restrict-DMA-engine-to-memorie.patch OBS-URL: https://build.opensuse.org/request/show/1007904 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=735
67 lines
2.1 KiB
Diff
67 lines
2.1 KiB
Diff
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Tue, 4 Oct 2022 10:32:03 +0100
|
|
Subject: linux-user: add more compat ioctl definitions
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 0000000000000000000000000000000000000000
|
|
Refereces: bsc#1204001
|
|
|
|
GLibc changes prevent us from including linux/fs.h anymore,
|
|
and we previously adjusted to this in
|
|
|
|
commit 3cd3df2a9584e6f753bb62a0028bd67124ab5532
|
|
Author: Daniel P. Berrangé <berrange@redhat.com>
|
|
Date: Tue Aug 2 12:41:34 2022 -0400
|
|
|
|
linux-user: fix compat with glibc >= 2.36 sys/mount.h
|
|
|
|
That change required adding compat ioctl definitions on the
|
|
QEMU side for any ioctls that we would otherwise obtain
|
|
from linux/fs.h. This commit adds more that were initially
|
|
missed, due to their usage being conditionalized in QEMU.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
|
|
---
|
|
linux-user/syscall.c | 25 +++++++++++++++++++++++++
|
|
1 file changed, 25 insertions(+)
|
|
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index 9d92e56e3996dc2174a4af9d0491..5acb463d5e11311b2108358c7c01 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -111,6 +111,31 @@
|
|
#define FS_IOC32_SETFLAGS _IOW('f', 2, int)
|
|
#define FS_IOC32_GETVERSION _IOR('v', 1, int)
|
|
#define FS_IOC32_SETVERSION _IOW('v', 2, int)
|
|
+
|
|
+#define BLKGETSIZE64 _IOR(0x12,114,size_t)
|
|
+#define BLKDISCARD _IO(0x12,119)
|
|
+#define BLKIOMIN _IO(0x12,120)
|
|
+#define BLKIOOPT _IO(0x12,121)
|
|
+#define BLKALIGNOFF _IO(0x12,122)
|
|
+#define BLKPBSZGET _IO(0x12,123)
|
|
+#define BLKDISCARDZEROES _IO(0x12,124)
|
|
+#define BLKSECDISCARD _IO(0x12,125)
|
|
+#define BLKROTATIONAL _IO(0x12,126)
|
|
+#define BLKZEROOUT _IO(0x12,127)
|
|
+
|
|
+#define FIBMAP _IO(0x00,1)
|
|
+#define FIGETBSZ _IO(0x00,2)
|
|
+
|
|
+struct file_clone_range {
|
|
+ __s64 src_fd;
|
|
+ __u64 src_offset;
|
|
+ __u64 src_length;
|
|
+ __u64 dest_offset;
|
|
+};
|
|
+
|
|
+#define FICLONE _IOW(0x94, 9, int)
|
|
+#define FICLONERANGE _IOW(0x94, 13, struct file_clone_range)
|
|
+
|
|
#else
|
|
#include <linux/fs.h>
|
|
#endif
|