diff options
| -rw-r--r-- | compiler-rt/lib/msan/lit_tests/Linux/ioctl_sound.cc (renamed from compiler-rt/lib/msan/lit_tests/ioctl_sound.cc) | 0 | ||||
| -rwxr-xr-x | compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc | 4 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 5 | ||||
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/compiler-rt/lib/msan/lit_tests/ioctl_sound.cc b/compiler-rt/lib/msan/lit_tests/Linux/ioctl_sound.cc index f920b96..f920b96 100644 --- a/compiler-rt/lib/msan/lit_tests/ioctl_sound.cc +++ b/compiler-rt/lib/msan/lit_tests/Linux/ioctl_sound.cc 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 e9372421..d21b291 100755 --- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc @@ -356,7 +356,9 @@ static void ioctl_table_fill() { _(VT_SENDSIG, NONE, 0); _(VT_SETMODE, READ, struct_vt_mode_sz); _(VT_WAITACTIVE, NONE, 0); +#endif +#if SANITIZER_LINUX && !SANITIZER_ANDROID // <sound/asound.h>. READWRITE is used correctly in this group. _(SNDRV_HWDEP_IOCTL_PVERSION, WRITE, sizeof(int)) _(SNDRV_HWDEP_IOCTL_INFO, WRITE, struct_snd_hwdep_info_sz) @@ -479,9 +481,7 @@ static void ioctl_table_fill() { _(SNDRV_EMUX_IOCTL_REMOVE_LAST_SAMPLES, NONE, 0) _(SNDRV_EMUX_IOCTL_MEM_AVAIL, READ, sizeof(int)) _(SNDRV_EMUX_IOCTL_MISC_MODE, READWRITE, struct_snd_emux_misc_mode_sz) -#endif -#if SANITIZER_LINUX && !SANITIZER_ANDROID // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE _(CYGETDEFTHRESH, WRITE, sizeof(int)); _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc index 63736a5..b6c1f7d 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc @@ -119,7 +119,7 @@ #include <sys/sockio.h> #endif -#if SANITIZER_LINUX +#if SANITIZER_LINUX && !SANITIZER_ANDROID #include <sound/asound.h> #include <sound/asound_fm.h> #include <sound/hdsp.h> @@ -825,8 +825,7 @@ namespace __sanitizer { unsigned IOCTL_TIOCSERGETMULTI = TIOCSERGETMULTI; unsigned IOCTL_TIOCSERSETMULTI = TIOCSERSETMULTI; unsigned IOCTL_TIOCSSERIAL = TIOCSSERIAL; -#endif -#if SANITIZER_LINUX + unsigned IOCTL_SNDRV_HWDEP_IOCTL_PVERSION = SNDRV_HWDEP_IOCTL_PVERSION; unsigned IOCTL_SNDRV_HWDEP_IOCTL_INFO = SNDRV_HWDEP_IOCTL_INFO; unsigned IOCTL_SNDRV_HWDEP_IOCTL_DSP_STATUS = SNDRV_HWDEP_IOCTL_DSP_STATUS; 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 26acbd1..e2ffcd7 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h +++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h @@ -1055,8 +1055,7 @@ namespace __sanitizer { extern unsigned IOCTL_TIOCSERGETMULTI; extern unsigned IOCTL_TIOCSERSETMULTI; extern unsigned IOCTL_TIOCSSERIAL; -#endif -#if SANITIZER_LINUX + extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_PVERSION; extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_INFO; extern unsigned IOCTL_SNDRV_HWDEP_IOCTL_DSP_STATUS; |