Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7951102 authored by Josh Gao's avatar Josh Gao
Browse files

Reenable fdsan in the zygote post-fork. 

By default, fdsan is disabled after forking to avoid breaking 'fork();
close(0..1024); exec(...)'. Reenable it in the zygote manually.

Bug: http://b/110100358
Test: booted walleye-aosp
Change-Id: I8706e4153e4e91306f50d215a62fe02d445082e1
parent 107e6f2f

core/jni/com_android_internal_os_Zygote.cpp

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include <sstream>

#include <string>



#include <android/fdsan.h>

#include <fcntl.h>

#include <grp.h>

#include <inttypes.h>
@@ -789,6 +790,8 @@ static pid_t ForkCommon(JNIEnv* env, jstring java_se_name, bool is_system_server 
    fail_fn(error_msg);

  }



  android_fdsan_error_level fdsan_error_level = android_fdsan_get_error_level();



  pid_t pid = fork();



  if (pid == 0) {
@@ -805,6 +808,9 @@ static pid_t ForkCommon(JNIEnv* env, jstring java_se_name, bool is_system_server 
    if (!gOpenFdTable->ReopenOrDetach(&error_msg)) {

      fail_fn(error_msg);

    }



    // Turn fdsan back on.

    android_fdsan_set_error_level(fdsan_error_level);

  }



  // We blocked SIGCHLD prior to a fork, we unblock it here.