[compiler-rt] fix __sanitizer::struct_sock_fprog_sz availability

[devnexen]

No description provided.

[llvmbot]

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

Author: David CARLIER (devnexen)

Changes

---

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

1 Files Affected:

• (modified) compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp (+1-1)

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 c87d5ef42c9242..e0da2ac4fd303e 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -491,6 +491,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
   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);
+  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
 #endif // SANITIZER_LINUX
 
 #if SANITIZER_LINUX
@@ -537,7 +538,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
 
   unsigned struct_audio_buf_info_sz = sizeof(struct audio_buf_info);
   unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
-  unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
 #  endif  // SANITIZER_GLIBC
 
 #  if !SANITIZER_ANDROID && !SANITIZER_APPLE

[devnexen]

@Zentrik would you be able to test this branch ?

[github-actions]

⚠️ C/C++ code formatter, clang-format found issues in your code. ⚠️

You can test this locally with the following command:

git-clang-format --diff 41cde465acfddb44d400b0a53bb57960762312a2 14226a18399fd925fb9f8f8910fa8e30a6433178 --extensions h,inc -- compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h

View the diff from clang-format here.

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 aaaff56119..85219ad552 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -524,9 +524,9 @@ struct __sanitizer_dirent64 {
   // more fields that we don't care about
 };
 extern unsigned struct_sock_fprog_sz;
-#endif
+#  endif
 
-#if defined(__x86_64__) && !defined(_LP64)
+#  if defined(__x86_64__) && !defined(_LP64)
 typedef long long __sanitizer_clock_t;
 #else
 typedef long __sanitizer_clock_t;

[Zentrik]

I'm getting an error

[09:12:16] /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp:493:35: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::sock_fprog’
[09:12:16]   493 |   unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
[09:12:16]       |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~
[09:12:16] In file included from /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_posix.h:20,
[09:12:16]                  from /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_libignore.cpp:16:

[devnexen]

nvm, just checked it s not available on musl, fixing ...

[devnexen]

I'm getting an error

[09:12:16] /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp:493:35: error: invalid application of ‘sizeof’ to incomplete type ‘__sanitizer::sock_fprog’
[09:12:16]   493 |   unsigned struct_sock_fprog_sz = sizeof(struct sock_fprog);
[09:12:16]       |                                   ^~~~~~~~~~~~~~~~~~~~~~~~~
[09:12:16] In file included from /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_posix.h:20,
[09:12:16]                  from /workspace/srcdir/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_libignore.cpp:16:

Can you give it a try when you get the chance ? thx.

[Zentrik]

Great that worked thanks.

[vitalybuka]

Why not just #if SANITIZER_GLIBC ?

[vitalybuka]

android can't be GLIBC

[vitalybuka]

Suggested change

	# if !SANITIZER_ANDROID && SANITIZER_GLIBC
	# if SANITIZER_GLIBC

[vitalybuka]

With suggestion

[sertonix]

nvm, just checked it s not available on musl, fixing ...

It is available if you include the right kernel header (linux/filter.h, which for some reason is only included for glibc). Is there anything preventing that? (If not I can create a MR to fix this)