|
@@ -0,0 +1,39 @@
|
|
|
+From d2356ebb0084a0d80dbfe33040c9afe938c15d19 Mon Sep 17 00:00:00 2001
|
|
|
+From: Martin Liska <[email protected]>
|
|
|
+Date: Mon, 11 Jul 2022 22:03:14 +0200
|
|
|
+Subject: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream
|
|
|
+
|
|
|
+9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36
|
|
|
+
|
|
|
+(cherry picked from commit 2701442d0cf6292f6624443c15813d6d1a3562fe)
|
|
|
+---
|
|
|
+ .../sanitizer_platform_limits_posix.cpp | 10 ++++++----
|
|
|
+ 1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
+
|
|
|
+--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
|
++++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
|
+@@ -72,7 +72,9 @@
|
|
|
+ #include <sys/vt.h>
|
|
|
+ #include <linux/cdrom.h>
|
|
|
+ #include <linux/fd.h>
|
|
|
++#if SANITIZER_ANDROID
|
|
|
+ #include <linux/fs.h>
|
|
|
++#endif
|
|
|
+ #include <linux/hdreg.h>
|
|
|
+ #include <linux/input.h>
|
|
|
+ #include <linux/ioctl.h>
|
|
|
+@@ -828,10 +830,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
|
|
|
+ unsigned IOCTL_EVIOCGPROP = IOCTL_NOT_PRESENT;
|
|
|
+ unsigned IOCTL_EVIOCSKEYCODE_V2 = IOCTL_NOT_PRESENT;
|
|
|
+ #endif
|
|
|
+- unsigned IOCTL_FS_IOC_GETFLAGS = FS_IOC_GETFLAGS;
|
|
|
+- unsigned IOCTL_FS_IOC_GETVERSION = FS_IOC_GETVERSION;
|
|
|
+- unsigned IOCTL_FS_IOC_SETFLAGS = FS_IOC_SETFLAGS;
|
|
|
+- unsigned IOCTL_FS_IOC_SETVERSION = FS_IOC_SETVERSION;
|
|
|
++ unsigned IOCTL_FS_IOC_GETFLAGS = _IOR('f', 1, long);
|
|
|
++ unsigned IOCTL_FS_IOC_GETVERSION = _IOR('v', 1, long);
|
|
|
++ unsigned IOCTL_FS_IOC_SETFLAGS = _IOW('f', 2, long);
|
|
|
++ unsigned IOCTL_FS_IOC_SETVERSION = _IOW('v', 2, long);
|
|
|
+ unsigned IOCTL_GIO_CMAP = GIO_CMAP;
|
|
|
+ unsigned IOCTL_GIO_FONT = GIO_FONT;
|
|
|
+ unsigned IOCTL_GIO_UNIMAP = GIO_UNIMAP;
|