diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
@@ -445,7 +445,7 @@
 #define SANITIZER_INTERCEPT_SEM \
   (SI_LINUX || SI_FREEBSD || SI_NETBSD || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_PTHREAD_SETCANCEL SI_POSIX
-#define SANITIZER_INTERCEPT_MINCORE (SI_LINUX || SI_NETBSD || SI_SOLARIS)
+#define SANITIZER_INTERCEPT_MINCORE (SI_LINUX || SI_NETBSD || SI_FREEBSD || SI_SOLARIS)
 #define SANITIZER_INTERCEPT_PROCESS_VM_READV SI_LINUX
 #define SANITIZER_INTERCEPT_CTERMID \
   (SI_LINUX || SI_MAC || SI_FREEBSD || SI_NETBSD || SI_SOLARIS)
@@ -518,9 +518,9 @@
 #define SANITIZER_INTERCEPT_FGETLN (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_STRMODE (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_TTYENT SI_NETBSD
-#define SANITIZER_INTERCEPT_PROTOENT (SI_NETBSD || SI_LINUX)
+#define SANITIZER_INTERCEPT_PROTOENT (SI_NETBSD || SI_LINUX || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_PROTOENT_R SI_GLIBC
-#define SANITIZER_INTERCEPT_NETENT SI_NETBSD
+#define SANITIZER_INTERCEPT_NETENT (SI_NETBSD || SI_FREEBSD)
 #define SANITIZER_INTERCEPT_SETVBUF \
   (SI_NETBSD || SI_FREEBSD || SI_LINUX || SI_MAC)
 #define SANITIZER_INTERCEPT_GETMNTINFO (SI_NETBSD || SI_FREEBSD || SI_MAC)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_freebsd.h
@@ -114,6 +114,19 @@
   long key;
 };
 
+struct __sanitizer_protoent {
+  char *p_name;
+  char **p_aliases;
+  int p_proto;
+};
+
+struct __sanitizer_netent {
+  char *n_name;
+  char **n_aliases;
+  int n_addrtype;
+  u32 n_net;
+};
+
 #if !defined(__i386__)
 typedef long long __sanitizer_time_t;
 #else
diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/netent.cpp b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/netent.cpp
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/netent.cpp
@@ -0,0 +1,84 @@
+// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
+
+#include <inttypes.h>
+#include <netdb.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define STRING_OR_NULL(x) ((x) ? (x) : "null")
+
+void test1() {
+  struct netent *ntp = getnetent();
+
+  printf("%s ", ntp->n_name);
+
+  for (char **cp = ntp->n_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d ", ntp->n_addrtype);
+  printf("%" PRIu32 "\n", ntp->n_net);
+
+  endnetent();
+}
+
+void test2() {
+  struct netent *ntp = getnetbyname("loopback");
+
+  printf("%s ", ntp->n_name);
+
+  for (char **cp = ntp->n_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d ", ntp->n_addrtype);
+  printf("%" PRIu32 "\n", ntp->n_net);
+
+  endnetent();
+}
+
+void test3() {
+  struct netent *ntp = getnetbyaddr(127, 2);
+
+  printf("%s ", ntp->n_name);
+
+  for (char **cp = ntp->n_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d ", ntp->n_addrtype);
+  printf("%" PRIu32 "\n", ntp->n_net);
+
+  endnetent();
+}
+
+void test4() {
+  setnetent(1);
+
+  struct netent *ntp = getnetent();
+
+  printf("%s ", ntp->n_name);
+
+  for (char **cp = ntp->n_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d ", ntp->n_addrtype);
+  printf("%" PRIu32 "\n", ntp->n_net);
+
+  endnetent();
+}
+
+int main(void) {
+  printf("netent\n");
+
+  test1();
+  test2();
+  test3();
+  test4();
+
+  // CHECK: netent
+  // CHECK: loopback 2 127
+  // CHECK: loopback 2 127
+  // CHECK: loopback 2 127
+  // CHECK: loopback 2 127
+
+  return 0;
+}
diff --git a/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/protoent.cpp b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/protoent.cpp
new file mode 100644
--- /dev/null
+++ b/compiler-rt/test/sanitizer_common/TestCases/FreeBSD/protoent.cpp
@@ -0,0 +1,89 @@
+// RUN: %clangxx -O0 -g %s -o %t && %run %t 2>&1 | FileCheck %s
+
+#include <netdb.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define STRING_OR_NULL(x) ((x) ? (x) : "null")
+
+void test1() {
+  struct protoent *ptp = getprotoent();
+
+  printf("%s ", STRING_OR_NULL(ptp->p_name));
+
+  for (char **cp = ptp->p_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d\n", ptp->p_proto);
+  endprotoent();
+}
+
+void test2() {
+  struct protoent *ptp = getprotobyname("icmp");
+
+  printf("%s ", STRING_OR_NULL(ptp->p_name));
+
+  for (char **cp = ptp->p_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d\n", ptp->p_proto);
+  endprotoent();
+}
+
+void test3() {
+  struct protoent *ptp = getprotobynumber(1);
+
+  printf("%s ", STRING_OR_NULL(ptp->p_name));
+
+  for (char **cp = ptp->p_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d\n", ptp->p_proto);
+  endprotoent();
+}
+
+void test4() {
+  setprotoent(1);
+  struct protoent *ptp = getprotobynumber(1);
+
+  ptp = getprotobynumber(2);
+
+  printf("%s ", STRING_OR_NULL(ptp->p_name));
+
+  for (char **cp = ptp->p_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d\n", ptp->p_proto);
+  endprotoent();
+}
+
+void test5() {
+  struct protoent *ptp = getprotobyname("ttp");
+
+  printf("%s ", STRING_OR_NULL(ptp->p_name));
+
+  for (char **cp = ptp->p_aliases; *cp != NULL; cp++)
+    printf("%s ", STRING_OR_NULL(*cp));
+
+  printf("%d\n", ptp->p_proto);
+  endprotoent();
+}
+
+int main(void) {
+  printf("protoent\n");
+
+  test1();
+  test2();
+  test3();
+  test4();
+  test5();
+
+  // CHECK: protoent
+  // CHECK: hopopt HOPOPT 0
+  // CHECK: icmp ICMP 1
+  // CHECK: icmp ICMP 1
+  // CHECK: igmp IGMP 2
+  // CHECK: ttp TTP iptm IPTM 84
+
+  return 0;
+}