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

Commit ffd57d7a authored by Chris Wailes's avatar Chris Wailes
Browse files

Skip resetting the stack protector on eng builds 

This CL will cause the Zygote to skip re-initialization of the stack
protector cookie on Eng builds.  This will prevent interpreter functions
that would not normally appear on the critical call path from causing
stack check failures.

Bug: 265760793
Test:  m libandroid_runtime (to ensure correct branch of pre-processor
conditional is taken)

Change-Id: I7ec7ac5a2230d1078c818013ae90f3d2597734a3
parent e39d3e93

core/jni/Android.bp

+6 −0
Original line number Diff line number Diff line
@@ -40,6 +40,12 @@ cc_library_shared { 


    cppflags: ["-Wno-conversion-null"],



    product_variables: {

        eng: {

            cflags: ["-DNO_RESET_STACK_PROTECTOR"],

        },

    },



    cpp_std: "gnu++20",



    srcs: [

core/jni/com_android_internal_os_Zygote.cpp

+1 −1
Original line number Diff line number Diff line
@@ -2296,7 +2296,7 @@ pid_t zygote::ForkCommon(JNIEnv* env, bool is_system_server, 
      setpriority(PRIO_PROCESS, 0, PROCESS_PRIORITY_MIN);

    }



#if defined(__BIONIC__)

#if defined(__BIONIC__) && !defined(NO_RESET_STACK_PROTECTOR)

    // Reset the stack guard for the new process.

    android_reset_stack_guards();

#endif