[sanitizer_common] Implement funopen*() interceptors for NetBSD

[krytarowski]

Shouldn't this follow SANITIZER_INTERCEPT_FOPENCOOKIE and implement a wrapper for operations?

[mgorny]

Implemented wrappers as requested.

[mgorny]

Fixed accidental whitespace change.

[krytarowski]

lib/sanitizer_common/sanitizer_common_interceptors.inc

9142

I would call it WrappedFunopenCookie to be less generic, similarly for funopen2.

[krytarowski]

lib/sanitizer_common/sanitizer_common_interceptors.inc

9150

How about wrapped_funopen_read etc? It won't clash with future potential inteceptors with so generic names.

[mgorny]

Renamed stuff as requested.

lib/sanitizer_common/sanitizer_common_interceptors.inc

INTERCEPTOR(int, pclose, __sanitizer_FILE *fp) {
   }
   return res;
 }
 #define INIT_PCLOSE COMMON_INTERCEPT_FUNCTION(pclose);
 #else
 #define INIT_PCLOSE
 #endif
 
+#if SANITIZER_INTERCEPT_FUNOPEN
+INTERCEPTOR(__sanitizer_FILE *, funopen, void *cookie,
+            int (*readfn)(void *cookie, char *buf, int len),
+            int (*writefn)(void *cookie, const char *buf, int len),
+            OFF_T (*seekfn)(void *cookie, OFF_T pos, int whence),
+            int (*closefn)(void *cookie)) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, funopen, cookie, readfn, writefn,
+                           seekfn, closefn);
+  __sanitizer_FILE *res = REAL(funopen)(cookie, readfn, writefn, seekfn,
+                                        closefn);
+  if (res) unpoison_file(res);
+  return res;
+}
+#define INIT_FUNOPEN COMMON_INTERCEPT_FUNCTION(funopen)
+#else
+#define INIT_FUNOPEN
+#endif
+
+#if SANITIZER_INTERCEPT_FUNOPEN2
+INTERCEPTOR(__sanitizer_FILE *, funopen2, void *cookie,
+            SSIZE_T (*readfn)(void *cookie, void *buf, SIZE_T len),
+            SSIZE_T (*writefn)(void *cookie, const void *buf, SIZE_T len),
+            OFF_T (*seekfn)(void *cookie, OFF_T pos, int whence),
+            int (*flushfn)(void *cookie),
+            int (*closefn)(void *cookie)) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, funopen2, cookie, readfn, writefn,
+                           seekfn, flushfn, closefn);
+  __sanitizer_FILE *res = REAL(funopen2)(cookie, readfn, writefn, seekfn,
+                                         flushfn, closefn);
+  if (res) unpoison_file(res);
+  return res;
+}
+#define INIT_FUNOPEN2 COMMON_INTERCEPT_FUNCTION(funopen2)
+#else
+#define INIT_FUNOPEN2
+#endif
+
 static void InitializeCommonInterceptors() {
   static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
   interceptor_metadata_map =
       new ((void *)&metadata_mem) MetadataHashMap();  // NOLINT
 
   INIT_MMAP;
   INIT_MMAP64;
   INIT_TEXTDOMAIN;
static void InitializeCommonInterceptors() {
   INIT_FSEEK;
   INIT_MD2;
   INIT_SHA2;
   INIT_VIS;
   INIT_CDB;
   INIT_POPEN;
   INIT_POPENVE;
   INIT_PCLOSE;
+  INIT_FUNOPEN;
+  INIT_FUNOPEN2;
 
   INIT___PRINTF_CHK;
 }

lib/sanitizer_common/sanitizer_platform_interceptors.h

 #define SANITIZER_INTERCEPT_MD2 SI_NETBSD
 #define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
 #define SANITIZER_INTERCEPT_CDB SI_NETBSD
 #define SANITIZER_INTERCEPT_VIS (SI_NETBSD || SI_FREEBSD)
 
 #define SANITIZER_INTERCEPT_POPEN SI_POSIX
 #define SANITIZER_INTERCEPT_POPENVE SI_NETBSD
 #define SANITIZER_INTERCEPT_PCLOSE SI_POSIX
+#define SANITIZER_INTERCEPT_FUNOPEN SI_NETBSD
+#define SANITIZER_INTERCEPT_FUNOPEN2 SI_NETBSD
 
 #endif  // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H