release/20.x: [sanitizer_common] Remove interceptors for deprecated struct termio (#137403)

[llvmbot]

Backport 59978b2

Requested by: @tstellar

[llvmbot]

@enh-google What do you think about merging this PR to the release branch?

[llvmbot]

@llvm/pr-subscribers-compiler-rt-sanitizer

Author: None (llvmbot)

Changes

Backport 59978b2

Requested by: @tstellar

---

Full diff: https://github.com/llvm/llvm-project/pull/137707.diff

3 Files Affected:

• (modified) compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc (-8)
• (modified) compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp (-3)
• (modified) compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h (-1)

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 49ec4097c900b..dda11daa77f49 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+++ b/compiler-rt/lib/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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
index a5311d266b0c4..10b6535499def 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 1a7d9e64048eb..005ff27624629 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/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;

[hpax]

So I realize I'm coming late to this party, but there are other problems too: the termios ioctls (TCGETS, TCSETS*) are using the wrong structure, because struct termios comes from glibc, not from the kernel.

I think that both issues can be solved by including <linux/termios.h> instead of <termios.h>. Note that they are mutually exclusive, because that will import the kernel "struct termios".

Finally, the sanitizer is completely missing the v2 termios ioctls, which also require <linux/termios.h> to be included. Those are:

TCGETS2
TCSETS2
TCSETSW2
TCSETSF2

Note that not all Linux platforms have these, because some simply didn't need them (the kernel native struct termios was "already" termios2.)

That being said, these ioctls are all new enough to have the size and direction encoded in the ioctl number, so I don't know if that means that you don't need to have special code for them.

[codonell]

Since glibc is removing the deprecated interfaces it seems sensible to me to include <linux/termios.h> but keep in mind that when glibc adds the v2 termios ioctls via @hpax current RFC for glibc, that we'll have the opportunity to do additional checking for those APIs.