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

Commit 66d32c74 authored by Jorge Lucangeli Obes's avatar Jorge Lucangeli Obes Committed by Gerrit Code Review
Browse files

Merge "Use CAP_MASK_LONG for file capabilities."

parents c5d278d4 e920c46e

include/private/android_filesystem_config.h

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#include "android_filesystem_capability.h"

#endif



#define CAP_MASK_LONG(cap_name)  (1ULL << (cap_name))



/* This is the master Users and Groups config for the platform.

 * DO NOT EVER RENUMBER

 */

libcutils/fs_config.c

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static const struct fs_path_config android_files[] = { 
    { 04770, AID_ROOT,      AID_RADIO,     0, "system/bin/pppd-ril" },



    /* the following files have enhanced capabilities and ARE included in user builds. */

    { 00750, AID_ROOT,      AID_SHELL,     (1ULL << CAP_SETUID) | (1ULL << CAP_SETGID), "system/bin/run-as" },

    { 00700, AID_SYSTEM,    AID_SHELL,     (1ULL << CAP_BLOCK_SUSPEND), "system/bin/inputflinger" },

    { 00750, AID_ROOT,      AID_SHELL,     CAP_MASK_LONG(CAP_SETUID) | CAP_MASK_LONG(CAP_SETGID), "system/bin/run-as" },

    { 00700, AID_SYSTEM,    AID_SHELL,     CAP_MASK_LONG(CAP_BLOCK_SUSPEND), "system/bin/inputflinger" },



    { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/uncrypt" },

    { 00750, AID_ROOT,      AID_ROOT,      0, "system/bin/install-recovery.sh" },