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

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

Merge "dumpstate: fix retention of CAP_SYSLOG after dropping root" into main... 

Merge "dumpstate: fix retention of CAP_SYSLOG after dropping root" into main am: a11f5b1c am: a013922e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3278331



Change-Id: Idff0c233d90304eacbc4e10683b4a6d237d83ac3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 82650c52 a013922e

cmds/dumpstate/DumpstateInternal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ bool DropRootUser() { 


    const uint32_t cap_syslog_mask = CAP_TO_MASK(CAP_SYSLOG);

    const uint32_t cap_syslog_index = CAP_TO_INDEX(CAP_SYSLOG);

    bool has_cap_syslog = (capdata[cap_syslog_index].effective & cap_syslog_mask) != 0;

    bool has_cap_syslog = (capdata[cap_syslog_index].permitted & cap_syslog_mask) != 0;



    memset(&capdata, 0, sizeof(capdata));

    if (has_cap_syslog) {