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

Commit 4b61fefc authored by Nate Myren's avatar Nate Myren Committed by Evelyn Torres
Browse files

RESTRICT AUTOMERGE Prevent root from getting unverified attributions from non system apps 

Similar to shell, system server, and other packages, the root UID
bypasses attribution tag registration requirements. This can be
exploited by a malicious proxy app.

Also fixes a bug which caused an unverified proxy app's attribution tag
to be erroneously called "valid" if "finishProxyOp" was called for a
non-system proxy app, and one of the special proxied apps

Bug: 416491779
Test: atest AppOpsMemoryUsageTest
Flag: EXEMPT see bug
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ab99cde450cf900767a641ddcf71f4a42e771334)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:889d0cb5cc8d7a4cf06c7c5ff0620353378749f7)
Merged-In: I9b44465554e10b803bc9b4ab76130aaf9933f605
Change-Id: I9b44465554e10b803bc9b4ab76130aaf9933f605
parent f949e70f

services/core/java/com/android/server/appop/AppOpsService.java

+38 −21
Original line number Diff line number Diff line
@@ -4144,17 +4144,24 @@ public class AppOpsService extends IAppOpsService.Stub { 
            return null;

        }



        finishOperationUnchecked(clientId, code, proxiedUid, resolvedProxiedPackageName,

                proxiedAttributionTag);

        finishOperationUnchecked(clientId, code, proxyUid, resolvedProxyPackageName,

                proxiedUid, resolvedProxiedPackageName, proxiedAttributionTag);



        return null;

    }



    private void finishOperationUnchecked(IBinder clientId, int code, int uid, String packageName,

            String attributionTag) {

    private void finishOperationUnchecked(IBinder clientId, int code, int uid,

            String packageName, String attributionTag) {

        finishOperationUnchecked(clientId, code, -1, null, uid, packageName, attributionTag);

    }



    private void finishOperationUnchecked(IBinder clientId, int code, int proxyUid,

            String proxyPackageName, int proxiedUid,

            String proxiedPackageName, String attributionTag) {

        PackageVerificationResult pvr;

        try {

            pvr = verifyAndGetBypass(uid, packageName, attributionTag);

            pvr = verifyAndGetBypass(proxiedUid, proxiedPackageName, attributionTag,

                    proxyUid, proxyPackageName);

            if (!pvr.isAttributionTagValid) {

                attributionTag = null;

            }
@@ -4164,16 +4171,18 @@ public class AppOpsService extends IAppOpsService.Stub { 
        }



        synchronized (this) {

            Op op = getOpLocked(code, uid, packageName, attributionTag, pvr.isAttributionTagValid,

                    pvr.bypass, /* edit */ true);

            Op op = getOpLocked(code, proxiedUid, proxiedPackageName, attributionTag,

                    pvr.isAttributionTagValid, pvr.bypass, /* edit */ true);

            if (op == null) {

                Slog.e(TAG, "Operation not found: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Operation not found: uid=" + proxiedUid + " pkg=" + proxiedPackageName

                        + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

                return;

            }

            final AttributedOp attributedOp = op.mAttributions.get(attributionTag);

            if (attributedOp == null) {

                Slog.e(TAG, "Attribution not found: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Attribution not found: uid=" + proxiedUid

                        + " pkg=" + proxiedPackageName + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

                return;

            }
@@ -4181,7 +4190,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            if (attributedOp.isRunning() || attributedOp.isPaused()) {

                attributedOp.finished(clientId);

            } else {

                Slog.e(TAG, "Operation not started: uid=" + uid + " pkg=" + packageName + "("

                Slog.e(TAG, "Operation not started: uid=" + proxiedUid

                        + " pkg=" + proxiedPackageName + "("

                        + attributionTag + ") op=" + AppOpsManager.opToName(code));

            }

        }
@@ -4586,9 +4596,13 @@ public class AppOpsService extends IAppOpsService.Stub { 
            @Nullable String attributionTag, int proxyUid, @Nullable String proxyPackageName,

            boolean suppressErrorLogs) {

        if (uid == Process.ROOT_UID) {

            // For backwards compatibility, don't check package name for root UID.

            // For backwards compatibility, don't check package name for root UID, unless someone

            // is claiming to be a proxy for root, which should never happen in normal usage.

            // We only allow bypassing the attribution tag verification if the proxy is a

            // system app (or is null), in order to prevent abusive apps clogging the appops

            // system with unlimited attribution tags via proxy calls.

            return new PackageVerificationResult(null,

                    /* isAttributionTagValid */ true);

                    /* isAttributionTagValid */ isPackageNullOrSystem(proxyPackageName, proxyUid));

        }



        // Do not check if uid/packageName/attributionTag is already known.
@@ -4631,16 +4645,8 @@ public class AppOpsService extends IAppOpsService.Stub { 
            // We only allow bypassing the attribution tag verification if the proxy is a

            // system app (or is null), in order to prevent abusive apps clogging the appops

            // system with unlimited attribution tags via proxy calls.

            boolean proxyIsSystemAppOrNull = true;

            if (proxyPackageName != null) {

                int proxyAppId = UserHandle.getAppId(proxyUid);

                if (proxyAppId >= Process.FIRST_APPLICATION_UID) {

                    proxyIsSystemAppOrNull =

                            mPackageManagerInternal.isSystemPackage(proxyPackageName);

                }

            }

            return new PackageVerificationResult(RestrictionBypass.UNRESTRICTED,

                    /* isAttributionTagValid */ proxyIsSystemAppOrNull);

                    /* isAttributionTagValid */ isPackageNullOrSystem(proxyPackageName, proxyUid));

        }



        int userId = UserHandle.getUserId(uid);
@@ -4702,6 +4708,17 @@ public class AppOpsService extends IAppOpsService.Stub { 
        return new PackageVerificationResult(bypass, isAttributionTagValid);

    }



    private boolean isPackageNullOrSystem(String packageName, int uid) {

        if (packageName == null) {

            return true;

        }

        int appId = UserHandle.getAppId(uid);

        if (appId > 0 && appId < Process.FIRST_APPLICATION_UID) {

            return true;

        }

        return mPackageManagerInternal.isSystemPackage(packageName);

    }



    private boolean isAttributionInPackage(@Nullable AndroidPackage pkg,

            @Nullable String attributionTag) {

        if (pkg == null) {