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

Commit 1547ee72 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Keystore 2.0: Add keystore2 to llkd ignore list." am: 8a8bde07 am:... 

Merge "Keystore 2.0: Add keystore2 to llkd ignore list." am: 8a8bde07 am: 12d6fefb am: b45e82e9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1636239

Change-Id: I6387c5bd0ea996e5ea91cddf81324f18cb8ed0f9
parents 804fd383 b45e82e9

llkd/README.md

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ Comma-separated list of uid numbers or names. Default is empty or false. 


The `llkd` does not monitor the specified subset of processes for live lock stack

signatures. Default is process names

`init,lmkd.llkd,llkd,keystore,ueventd,apexd,logd`. Prevents the sepolicy

`init,lmkd.llkd,llkd,keystore,keystore2,ueventd,apexd,logd`. Prevents the sepolicy

violation associated with processes that block `ptrace` (as these can't be

checked). **Active only on userdebug and eng builds**. For details on build

types, refer to [Building Android](/setup/build/building#choose-a-target).

llkd/include/llkd.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ unsigned llkCheckMilliseconds(void); 
#define LLK_IGNORELIST_UID_PROPERTY     "ro.llk.ignorelist.uid"

#define LLK_IGNORELIST_UID_DEFAULT      ""

#define LLK_IGNORELIST_STACK_PROPERTY   "ro.llk.ignorelist.process.stack"

#define LLK_IGNORELIST_STACK_DEFAULT    "init,lmkd.llkd,llkd,keystore,ueventd,apexd"

#define LLK_IGNORELIST_STACK_DEFAULT    "init,lmkd.llkd,llkd,keystore,keystore2,ueventd,apexd"

/* clang-format on */



__END_DECLS

llkd/libllkd.cpp

+2 −2
Original line number Diff line number Diff line
@@ -115,8 +115,8 @@ std::unordered_map<std::string, std::unordered_set<std::string>> llkIgnorelistPa 
// list of uids, and uid names, to skip, default nothing

std::unordered_set<std::string> llkIgnorelistUid;

#ifdef __PTRACE_ENABLED__

// list of names to skip stack checking. "init", "lmkd", "llkd", "keystore" or

// "logd" (if not userdebug).

// list of names to skip stack checking. "init", "lmkd", "llkd", "keystore",

// "keystore2", or "logd" (if not userdebug).

std::unordered_set<std::string> llkIgnorelistStack;

#endif