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
102 lines
3.5 KiB
Diff
102 lines
3.5 KiB
Diff
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Tue, 4 Oct 2022 10:32:04 +0100
|
|
Subject: linux-user: remove conditionals for many fs.h ioctls
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Git-commit: 0000000000000000000000000000000000000000
|
|
Refereces: bsc#1204001
|
|
|
|
These ioctls have been defined in linux/fs.h for a long time
|
|
|
|
* BLKGETSIZE64 - <2.6.12 (linux.git epoch)
|
|
* BLKDISCARD - 2.6.28 (d30a2605be9d5132d95944916e8f578fcfe4f976)
|
|
* BLKIOMIN - 2.6.32 (ac481c20ef8f6c6f2be75d581863f40c43874ef7)
|
|
* BLKIOOPT - 2.6.32 (ac481c20ef8f6c6f2be75d581863f40c43874ef7)
|
|
* BLKALIGNOFF - 2.6.32 (ac481c20ef8f6c6f2be75d581863f40c43874ef7)
|
|
* BLKPBSZGET - 2.6.32 (ac481c20ef8f6c6f2be75d581863f40c43874ef7)
|
|
* BLKDISCARDZEROES - 2.6.32 (98262f2762f0067375f83824d81ea929e37e6bfe)
|
|
* BLKSECDISCARD - 2.6.36 (8d57a98ccd0b4489003473979da8f5a1363ba7a3)
|
|
* BLKROTATIONAL - 3.2 (ef00f59c95fe6e002e7c6e3663cdea65e253f4cc)
|
|
* BLKZEROOUT - 3.6 (66ba32dc167202c3cf8c86806581a9393ec7f488)
|
|
* FIBMAP - <2.6.12 (linux.git epoch)
|
|
* FIGETBSZ - <2.6.12 (linux.git epoch)
|
|
|
|
and when building with latest glibc, we'll see compat definitions
|
|
in syscall.c anyway thanks to the previous patch. Thus we can
|
|
assume they always exist and remove the conditional checks.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Signed-off-by: Dario Faggioli <dfaggioli@suse.com>
|
|
---
|
|
linux-user/ioctls.h | 24 ------------------------
|
|
1 file changed, 24 deletions(-)
|
|
|
|
diff --git a/linux-user/ioctls.h b/linux-user/ioctls.h
|
|
index f182d40190ed43ffa1bbc4fd09cb..071f7ca2537560e3c923c9a18abb 100644
|
|
--- a/linux-user/ioctls.h
|
|
+++ b/linux-user/ioctls.h
|
|
@@ -96,9 +96,7 @@
|
|
IOCTL(BLKROGET, IOC_R, MK_PTR(TYPE_INT))
|
|
IOCTL(BLKRRPART, 0, TYPE_NULL)
|
|
IOCTL(BLKGETSIZE, IOC_R, MK_PTR(TYPE_ULONG))
|
|
-#ifdef BLKGETSIZE64
|
|
IOCTL(BLKGETSIZE64, IOC_R, MK_PTR(TYPE_ULONGLONG))
|
|
-#endif
|
|
IOCTL(BLKFLSBUF, 0, TYPE_NULL)
|
|
IOCTL(BLKRASET, 0, TYPE_INT)
|
|
IOCTL(BLKRAGET, IOC_R, MK_PTR(TYPE_LONG))
|
|
@@ -107,33 +105,15 @@
|
|
IOCTL_SPECIAL(BLKPG, IOC_W, do_ioctl_blkpg,
|
|
MK_PTR(MK_STRUCT(STRUCT_blkpg_ioctl_arg)))
|
|
|
|
-#ifdef BLKDISCARD
|
|
IOCTL(BLKDISCARD, IOC_W, MK_PTR(MK_ARRAY(TYPE_ULONGLONG, 2)))
|
|
-#endif
|
|
-#ifdef BLKIOMIN
|
|
IOCTL(BLKIOMIN, IOC_R, MK_PTR(TYPE_INT))
|
|
-#endif
|
|
-#ifdef BLKIOOPT
|
|
IOCTL(BLKIOOPT, IOC_R, MK_PTR(TYPE_INT))
|
|
-#endif
|
|
-#ifdef BLKALIGNOFF
|
|
IOCTL(BLKALIGNOFF, IOC_R, MK_PTR(TYPE_INT))
|
|
-#endif
|
|
-#ifdef BLKPBSZGET
|
|
IOCTL(BLKPBSZGET, IOC_R, MK_PTR(TYPE_INT))
|
|
-#endif
|
|
-#ifdef BLKDISCARDZEROES
|
|
IOCTL(BLKDISCARDZEROES, IOC_R, MK_PTR(TYPE_INT))
|
|
-#endif
|
|
-#ifdef BLKSECDISCARD
|
|
IOCTL(BLKSECDISCARD, IOC_W, MK_PTR(MK_ARRAY(TYPE_ULONGLONG, 2)))
|
|
-#endif
|
|
-#ifdef BLKROTATIONAL
|
|
IOCTL(BLKROTATIONAL, IOC_R, MK_PTR(TYPE_SHORT))
|
|
-#endif
|
|
-#ifdef BLKZEROOUT
|
|
IOCTL(BLKZEROOUT, IOC_W, MK_PTR(MK_ARRAY(TYPE_ULONGLONG, 2)))
|
|
-#endif
|
|
|
|
IOCTL(FDMSGON, 0, TYPE_NULL)
|
|
IOCTL(FDMSGOFF, 0, TYPE_NULL)
|
|
@@ -149,17 +129,13 @@
|
|
IOCTL(FDTWADDLE, 0, TYPE_NULL)
|
|
IOCTL(FDEJECT, 0, TYPE_NULL)
|
|
|
|
-#ifdef FIBMAP
|
|
IOCTL(FIBMAP, IOC_W | IOC_R, MK_PTR(TYPE_LONG))
|
|
-#endif
|
|
#ifdef FICLONE
|
|
IOCTL(FICLONE, IOC_W, TYPE_INT)
|
|
IOCTL(FICLONERANGE, IOC_W, MK_PTR(MK_STRUCT(STRUCT_file_clone_range)))
|
|
#endif
|
|
|
|
-#ifdef FIGETBSZ
|
|
IOCTL(FIGETBSZ, IOC_R, MK_PTR(TYPE_LONG))
|
|
-#endif
|
|
#ifdef CONFIG_FIEMAP
|
|
IOCTL_SPECIAL(FS_IOC_FIEMAP, IOC_W | IOC_R, do_ioctl_fs_ioc_fiemap,
|
|
MK_PTR(MK_STRUCT(STRUCT_fiemap)))
|