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

Commit eba19367 authored by Nick Kralevich's avatar Nick Kralevich Committed by android-build-merger
Browse files

Merge "adbd: make a PR_CAPBSET_DROP error fatal." am: 57134ade 

am: 85ac05f4

* commit '85ac05f4':
  adbd: make a PR_CAPBSET_DROP error fatal.
parents 964d8591 85ac05f4

adb/daemon/main.cpp

+1 −5
Original line number Diff line number Diff line
@@ -54,11 +54,7 @@ static void drop_capabilities_bounding_set_if_needed() { 
        }



        int err = prctl(PR_CAPBSET_DROP, i, 0, 0, 0);



        // Some kernels don't have file capabilities compiled in, and

        // prctl(PR_CAPBSET_DROP) returns EINVAL. Don't automatically

        // die when we see such misconfigured kernels.

        if ((err < 0) && (errno != EINVAL)) {

        if (err < 0) {

            PLOG(FATAL) << "Could not drop capabilities";

        }

    }