Add a new interceptor for getvfsstat(2) from NetBSD

[krytarowski]

Summary

getvfsstat - gets list of all mounted file systems.

Add a dedicated test.

[vitalybuka]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

16

could you please declare vars were they used first time?

19

you can simplify the test with simple asserts here

[krytarowski]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

19

Do you mean: assert(rv != -1) ? err(3) is already simple enough so I will keep it.

[vitalybuka]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

19

I see couple other tiny reasons, which are not strong enough to block the patch, but maybe you'll still consider them.

The only important lines here are 17 and 25. The rest is just necessary distruction from the test, so smaller is better.

Also I'd prefer assert report with line number, which can be used for quick jump to location than current printout of "getvfsstat".

"if (!buf)" is totally unneeded as it crash anyway, and we don't to that in other tests.

If you don't CHECK them maybe: printf("Filesystem %d %s %s %s\n", i, buf[i].f_fstypename, buf[i].f_mntonname, buf[i].f_mntfromname);

and consistency: compiler_rt tests never use err() in cases like this, mostly asserts

[krytarowski]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

19

err(3) is a BSD style. I will switch it to assert and land soon.

[krytarowski]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

19

I still have 2-3 APIs to submit to review and I will start addressing reported comments from review.

[krytarowski]

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

19

I've replaced err(3) with assert(3). I will keep the current style of printf(3) and I will assert buf to be != NULL. It will certainly crash in the case of error.. but I feel that it's a little bit better programming style to check allocation for success.

lib/sanitizer_common/sanitizer_common_interceptors.inc

 #define INIT_SETVBUF COMMON_INTERCEPT_FUNCTION(setvbuf); \
     COMMON_INTERCEPT_FUNCTION(setbuf); \
     COMMON_INTERCEPT_FUNCTION(setbuffer); \
     COMMON_INTERCEPT_FUNCTION(setlinebuf)
 #else
 #define INIT_SETVBUF
 #endif
 
+#if SANITIZER_INTERCEPT_GETVFSSTAT
+INTERCEPTOR(int, getvfsstat, void *buf, SIZE_T bufsize, int flags) {
+  void *ctx;
+  COMMON_INTERCEPTOR_ENTER(ctx, getvfsstat, buf, bufsize, flags);
+  int ret = REAL(getvfsstat)(buf, bufsize, flags);
+  if (buf && ret > 0)
+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, ret * struct_statvfs_sz);
+  return ret;
+}
+#define INIT_GETVFSSTAT COMMON_INTERCEPT_FUNCTION(getvfsstat)
+#else
+#define INIT_GETVFSSTAT
+#endif
+
 static void InitializeCommonInterceptors() {
   static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
   interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
 
   INIT_MMAP;
   INIT_MMAP64;
   INIT_TEXTDOMAIN;
   INIT_STRLEN;
static void InitializeCommonInterceptors() {
   INIT_FGETLN;
   INIT_STRMODE;
   INIT_TTYENT;
   INIT_PROTOENT;
   INIT_NETENT;
   INIT_GETMNTINFO;
   INIT_MI_VECTOR_HASH;
   INIT_SETVBUF;
+  INIT_GETVFSSTAT;
 
   INIT___PRINTF_CHK;
 }

lib/sanitizer_common/sanitizer_platform_interceptors.h

 #define SANITIZER_INTERCEPT_STRMODE (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_TTYENT SI_NETBSD
 #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
 #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
 #define SANITIZER_INTERCEPT_SETVBUF (SI_NETBSD || SI_FREEBSD || \
   SI_LINUX || SI_MAC)
 #define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
 #define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
+#define SANITIZER_INTERCEPT_GETVFSSTAT SI_NETBSD
 
 #endif  // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H

test/sanitizer_common/TestCases/NetBSD/getvfsstat.cc

+// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
+
+#include <sys/types.h>
+
+#include <sys/statvfs.h>
+
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+int main(void) {
+  printf("getvfsstat\n");
+
+  int rv = getvfsstat(NULL, 0, ST_WAIT);
+  assert(rv != -1);
+
+  size_t sz = rv * sizeof(struct statvfs);
+  struct statvfs *buf = (struct statvfs *)malloc(sz);
+  assert(buf);
+
+  rv = getvfsstat(buf, sz, ST_WAIT);
+  assert(rv != -1);
+
+  for (int i = 0; i < rv; i++) {
+    printf("Filesystem %d\n", i);
+    printf("\tfstypename=%s\n", buf[i].f_fstypename);
+    printf("\tmntonname=%s\n", buf[i].f_mntonname);
+    printf("\tmntfromname=%s\n", buf[i].f_mntfromname);
+  }
+
+  free(buf);
+
+  // CHECK: getvfsstat
+
+  return 0;
+}