Temporary workaround for a double close crash with fdsan.

closes guardianproject/tor-android#57 Should be removed once fixed in Tor upstream: https://gitlab.torproject.org/tpo/core/tor/-/issues/40525
bitmold · Apr 7, 2024 · 517d241 · 517d241
1 parent cd23e61
commit 517d241
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/src/feature/api/org_torproject_jni_TorService.c b/src/feature/api/org_torproject_jni_TorService.c
@@ -240,6 +240,7 @@ Java_org_torproject_jni_TorService_mainConfigurationFree
     fprintf(stderr, "ConfigurationFree: The Tor configuration is NULL!\n");
     return;
   }
+  unset_owning_controller_socket(cfg);
   tor_main_configuration_free(cfg);
 }
 

diff --git a/src/feature/api/tor_api.c b/src/feature/api/tor_api.c
@@ -100,6 +100,17 @@ tor_main_configuration_set_command_line(tor_main_configuration_t *cfg,
   return 0;
 }
 
+/*
+ * Temporary workaround for a double close crash with fdsan.
+ * See: https://github.com/guardianproject/tor-android/issues/57
+ * Should be removed once fixed in Tor upstream.
+ */
+void
+unset_owning_controller_socket(tor_main_configuration_t* t)
+{
+    t->owning_controller_socket = -1;
+}
+
 tor_control_socket_t
 tor_main_configuration_setup_control_socket(tor_main_configuration_t *cfg)
 {

diff --git a/src/feature/api/tor_api_internal.h b/src/feature/api/tor_api_internal.h
@@ -31,4 +31,11 @@ struct tor_main_configuration_t {
   tor_socket_t owning_controller_socket;
 };
 
+/*
+ * Temporary workaround for a double close crash with fdsan.
+ * See: https://github.com/guardianproject/tor-android/issues/57
+ * Should be removed once fixed in Tor upstream.
+ */
+void unset_owning_controller_socket(tor_main_configuration_t* t);
+
 #endif /* !defined(TOR_API_INTERNAL_H) */
-Original file line number
+Diff line change
@@ Expand Up / @@ -240,6 +240,7 @@ Java_org_torproject_jni_TorService_mainConfigurationFree @@
         fprintf(stderr, "ConfigurationFree: The Tor configuration is NULL!\n");
         return;
       }
+      unset_owning_controller_socket(cfg);
       tor_main_configuration_free(cfg);
     }
@@ Expand Down @@