68 lines
3.0 KiB
Diff
68 lines
3.0 KiB
Diff
From 83bf10fffd7065317d50f19e138c9e9fd6adc064 Mon Sep 17 00:00:00 2001
|
|
From: Tom Stellard <tstellar@redhat.com>
|
|
Date: Fri, 25 Apr 2025 14:49:34 -0700
|
|
Subject: [PATCH] [sanitizer_common] Remove interceptors for deprecated struct
|
|
termio
|
|
|
|
This struct will be removed from glibc-2.42 and has been deprecated for
|
|
a very long time.
|
|
|
|
Fixes #137321
|
|
---
|
|
.../sanitizer_common_interceptors_ioctl.inc | 8 --------
|
|
.../sanitizer_common/sanitizer_platform_limits_posix.cpp | 3 ---
|
|
.../sanitizer_common/sanitizer_platform_limits_posix.h | 1 -
|
|
3 files changed, 12 deletions(-)
|
|
|
|
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
index f88f914b1d14..bc8f02826c61 100644
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
|
|
@@ -342,17 +342,9 @@ static void ioctl_table_fill() {
|
|
_(SOUND_PCM_WRITE_CHANNELS, WRITE, sizeof(int));
|
|
_(SOUND_PCM_WRITE_FILTER, WRITE, sizeof(int));
|
|
_(TCFLSH, NONE, 0);
|
|
-#if SANITIZER_GLIBC
|
|
- _(TCGETA, WRITE, struct_termio_sz);
|
|
-#endif
|
|
_(TCGETS, WRITE, struct_termios_sz);
|
|
_(TCSBRK, NONE, 0);
|
|
_(TCSBRKP, NONE, 0);
|
|
-#if SANITIZER_GLIBC
|
|
- _(TCSETA, READ, struct_termio_sz);
|
|
- _(TCSETAF, READ, struct_termio_sz);
|
|
- _(TCSETAW, READ, struct_termio_sz);
|
|
-#endif
|
|
_(TCSETS, READ, struct_termios_sz);
|
|
_(TCSETSF, READ, struct_termios_sz);
|
|
_(TCSETSW, READ, struct_termios_sz);
|
|
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
index b4d87ab6228e..7a89bf1c7498 100644
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
|
|
@@ -494,9 +494,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
|
|
unsigned struct_input_id_sz = sizeof(struct input_id);
|
|
unsigned struct_mtpos_sz = sizeof(struct mtpos);
|
|
unsigned struct_rtentry_sz = sizeof(struct rtentry);
|
|
-#if SANITIZER_GLIBC || SANITIZER_ANDROID
|
|
- unsigned struct_termio_sz = sizeof(struct termio);
|
|
-#endif
|
|
unsigned struct_vt_consize_sz = sizeof(struct vt_consize);
|
|
unsigned struct_vt_sizes_sz = sizeof(struct vt_sizes);
|
|
unsigned struct_vt_stat_sz = sizeof(struct vt_stat);
|
|
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
index 348bb4f27aec..fdc52aa56c49 100644
|
|
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
|
|
@@ -1063,7 +1063,6 @@ extern unsigned struct_hd_geometry_sz;
|
|
extern unsigned struct_input_absinfo_sz;
|
|
extern unsigned struct_input_id_sz;
|
|
extern unsigned struct_mtpos_sz;
|
|
-extern unsigned struct_termio_sz;
|
|
extern unsigned struct_vt_consize_sz;
|
|
extern unsigned struct_vt_sizes_sz;
|
|
extern unsigned struct_vt_stat_sz;
|
|
--
|
|
2.48.1
|
|
|