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

Commit 109f4e16 authored by Nick Kralevich's avatar Nick Kralevich
Browse files

adb: Use 64 bit capabilities. 

Fix the following kernel warning:

$ adb shell dmesg | grep adb
<6>[    7.813003] warning: `adbd' uses 32-bit capabilities (legacy support in use)

Change-Id: I3912302c5c577f1cb03f0c591834ab7b3a72ddf5
parent 17361134

adb/adb.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -1238,7 +1238,7 @@ int adb_main(int is_daemon, int server_port) 
    /* don't run as root if we are running in secure mode */

    /* don't run as root if we are running in secure mode */

    if (should_drop_privileges()) {

    if (should_drop_privileges()) {

        struct __user_cap_header_struct header;

        struct __user_cap_header_struct header;

        struct __user_cap_data_struct cap;

        struct __user_cap_data_struct cap[2];





        if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0) {

        if (prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0) != 0) {

            exit(1);

            exit(1);
@@ -1271,12 +1271,15 @@ int adb_main(int is_daemon, int server_port) 
            exit(1);

            exit(1);

        }

        }





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

        memset(cap, 0, sizeof(cap));



        /* set CAP_SYS_BOOT capability, so "adb reboot" will succeed */

        /* set CAP_SYS_BOOT capability, so "adb reboot" will succeed */

        header.version = _LINUX_CAPABILITY_VERSION;

        header.version = _LINUX_CAPABILITY_VERSION_3;

        header.pid = 0;

        header.pid = 0;

        cap.effective = cap.permitted = (1 << CAP_SYS_BOOT);

        cap[CAP_TO_INDEX(CAP_SYS_BOOT)].effective |= CAP_TO_MASK(CAP_SYS_BOOT);

        cap.inheritable = 0;

        cap[CAP_TO_INDEX(CAP_SYS_BOOT)].permitted |= CAP_TO_MASK(CAP_SYS_BOOT);

        capset(&header, &cap);

        capset(&header, cap);





        D("Local port disabled\n");

        D("Local port disabled\n");

    } else {

    } else {