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

Commit 8495e582 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Skip CheckServiceAccessNotOk when SELinux disabled" into main

parents fd1c5e80 41f883c1

libs/binder/tests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -163,6 +163,7 @@ cc_test { 
    ],

    static_libs: [

        "libgmock",

        "libselinux",

    ],

    test_suites: [

        "general-tests",

libs/binder/tests/binderLibTest.cpp

+9 −2
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <binder/unique_fd.h>

#include <input/BlockingQueue.h>

#include <processgroup/processgroup.h>

#include <selinux/selinux.h>

#include <utils/Flattenable.h>

#include <utils/SystemClock.h>

#include "binder/IServiceManagerUnitTestHelper.h"
@@ -366,6 +367,8 @@ class BinderLibTest : public ::testing::Test { 
                    ProcessState::DriverFeature::FREEZE_NOTIFICATION);

        }



        bool checkSelinuxPermissive() { return (security_getenforce() == 0); }



        bool getBinderPid(int32_t* pid, sp<IBinder> server) {

            Parcel data, replypid;

            if (server->transact(BINDER_LIB_TEST_GETPID, data, &replypid) != NO_ERROR) {
@@ -619,8 +622,12 @@ TEST_F(BinderLibTest, CheckServiceAccessOk) { 


TEST_F(BinderLibTest, CheckServiceAccessNotOk) {

    auto sm = defaultServiceManager();

    EXPECT_FALSE(sm->checkServiceAccess(String16("u:r:some_unknown_sid:s0"), 0, 0, String16("adb"),

                                        String16("find")));

    if (!checkSelinuxPermissive()) {

        EXPECT_FALSE(sm->checkServiceAccess(String16("u:r:some_unknown_sid:s0"), 0, 0,

                                            String16("adb"), String16("find")));

    } else {

        GTEST_SKIP() << "Skipping test for disabled SELinux config";

    }

}



TEST_F(BinderLibTest, CheckServiceAccessBadArgs) {