| Message ID | 7d96af3f-d1d2-6c09-3ddb-41ed51e5f208@suse.cz |
|---|---|
| State | New |
| Headers | show |
| Series | libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream | expand |
On Mon, Jul 11, 2022 at 10:05 PM Martin Liška <mliska@suse.cz> wrote: > > I'm going to push the following cherry-pick which fixes libasan > build with top-of-tree glibc. Can you also push this to active branches please? > Martin > > 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include <linux/fs.h> to resolve fsconfig_command/mount_attr conflict with glibc 2.36 > --- > .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > index 8ed3e92d270..97fd07acf9d 100644 > --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > @@ -73,7 +73,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> > @@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); > 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; > -- > 2.36.1 >
On 7/21/22 12:18, Richard Biener wrote:
> Can you also push this to active branches please?
Sure, I've just done that.
Cheers,
Martin
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp index 8ed3e92d270..97fd07acf9d 100644 --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp @@ -73,7 +73,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> @@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); 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;