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

Commit 0a86d010 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes Ibb4b4ca4,I31572afa 

* changes:
  llkd: test: llkd.sleep also check for __arm64_sys_openat
  llkd: requires sys_admin permissions
parents 11159b52 92f7bbfb

llkd/llkd-debuggable.rc

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ service llkd-1 /system/bin/llkd 
    disabled

    user llkd

    group llkd readproc

    capabilities KILL IPC_LOCK SYS_PTRACE DAC_OVERRIDE

    capabilities KILL IPC_LOCK SYS_PTRACE DAC_OVERRIDE SYS_ADMIN

    file /dev/kmsg w

    file /proc/sysrq-trigger w

    writepid /dev/cpuset/system-background/tasks

llkd/tests/llkd_test.cpp

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ seconds llkdSleepPeriod(char state) { 
        rest();

        std::string setprop("setprop ");

        // Manually check that SyS_openat is _added_ to the list when restarted

        execute((setprop + LLK_CHECK_STACK_PROPERTY + " ,SyS_openat").c_str());

        // 4.19+ kernels report __arm64_sys_openat b/147486902

        execute((setprop + LLK_CHECK_STACK_PROPERTY + " ,SyS_openat,__arm64_sys_openat").c_str());

        rest();

        execute((setprop + LLK_ENABLE_WRITEABLE_PROPERTY + " false").c_str());

        rest();