From c42187732d3c49a06b0097d0253036efd5153588 Mon Sep 17 00:00:00 2001 From: David Rubin Date: Thu, 7 Aug 2025 10:27:51 -0700 Subject: [PATCH] tsan: remove interceptors for termio --- .../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/lib/libtsan/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/libtsan/sanitizer_common/sanitizer_common_interceptors_ioctl.inc index 49ec4097c9..dda11daa77 100644 --- a/lib/libtsan/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +++ b/lib/libtsan/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -338,17 +338,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/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp index ec5f2edab6..b3e717591d 100644 --- a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp +++ b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.cpp @@ -485,9 +485,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/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.h b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.h index 1a7d9e6404..005ff27624 100644 --- a/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/lib/libtsan/sanitizer_common/sanitizer_platform_limits_posix.h @@ -1043,7 +1043,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;