commit e16082f717276fbbefb88418c82cd84dfba339c2
author Josh Gao <jmgao@google.com> Mon Aug 06 18:48:52 2018 -0700
committer Josh Gao <jmgao@google.com> Mon Aug 06 18:48:52 2018 -0700
tree c2be53510b5b50d4667da1e4e012a4f28cfe7f59
parent e6dab7b55fbcbb72b4b5b7edd3f46ca03da7bfe5

fdsan: expose the address of the table to the platform.

Let the debuggerd handler get the address of the fdsan table so that
crash_dump can parse it and print it out in tombstones.

Test: debuggerd `pidof adbd`
Change-Id: I2297200cae52d0ff24479dba55d1ab4938583501

libc/bionic/fdsan.cpp

diff --git a/libc/bionic/fdsan.cpp b/libc/bionic/fdsan.cpp
index 918fd37..43d8831 100644
--- a/libc/bionic/fdsan.cpp
+++ b/libc/bionic/fdsan.cpp
@@ -139,6 +139,11 @@
   return &__libc_shared_globals->fd_table;
 }
 
+// Exposed to the platform to allow crash_dump to print out the fd table.
+extern "C" void* android_fdsan_get_fd_table() {
+  return GetFdTable();
+}
+
 static FdEntry* GetFdEntry(int fd) {
   if (fd < 0) {
     return nullptr;

libc/libc.arm.map

diff --git a/libc/libc.arm.map b/libc/libc.arm.map
index 23ee3f3..6d39812 100644
--- a/libc/libc.arm.map
+++ b/libc/libc.arm.map
@@ -1661,6 +1661,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.arm64.map

diff --git a/libc/libc.arm64.map b/libc/libc.arm64.map
index eadf70d..1cf48b1 100644
--- a/libc/libc.arm64.map
+++ b/libc/libc.arm64.map
@@ -1379,6 +1379,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.map.txt

diff --git a/libc/libc.map.txt b/libc/libc.map.txt
index 12e657f..135206e 100644
--- a/libc/libc.map.txt
+++ b/libc/libc.map.txt
@@ -1687,6 +1687,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.mips.map

diff --git a/libc/libc.mips.map b/libc/libc.mips.map
index c7fe2c6..a330a45 100644
--- a/libc/libc.mips.map
+++ b/libc/libc.mips.map
@@ -1502,6 +1502,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.mips64.map

diff --git a/libc/libc.mips64.map b/libc/libc.mips64.map
index eadf70d..1cf48b1 100644
--- a/libc/libc.mips64.map
+++ b/libc/libc.mips64.map
@@ -1379,6 +1379,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.x86.map

diff --git a/libc/libc.x86.map b/libc/libc.x86.map
index f6d1871..7a2fe9a 100644
--- a/libc/libc.x86.map
+++ b/libc/libc.x86.map
@@ -1501,6 +1501,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;

libc/libc.x86_64.map

diff --git a/libc/libc.x86_64.map b/libc/libc.x86_64.map
index eadf70d..1cf48b1 100644
--- a/libc/libc.x86_64.map
+++ b/libc/libc.x86_64.map
@@ -1379,6 +1379,7 @@
     __system_property_area_init;
     __system_property_set_filename;
     __system_property_update;
+    android_fdsan_get_fd_table;
     android_net_res_stats_get_info_for_net;
     android_net_res_stats_aggregate;
     android_net_res_stats_get_usable_servers;