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

Commit b0ef6b77 authored by Rhed Jao's avatar Rhed Jao Committed by Automerger Merge Worker
Browse files

Merge "Fix permanent denial of service via apis with illegal intent filter"... 

Merge "Fix permanent denial of service via apis with illegal intent filter" into tm-qpr-dev am: 2e8ec835 am: 0c0e6a98

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20559211



Change-Id: I3c02df2589080f2be1882446dc6a340c008b150f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents d6d3a16f 0c0e6a98

core/java/android/content/IntentFilter.java

+23 −0
Original line number Diff line number Diff line
@@ -2890,6 +2890,29 @@ public class IntentFilter implements Parcelable { 
        */

    }



    /**

     * Perform a check on data paths and scheme specific parts of the intent filter.

     * Return true if it passed.

     * @hide

     */

    public boolean checkDataPathAndSchemeSpecificParts() {

        final int numDataPath = mDataPaths == null

                ? 0 : mDataPaths.size();

        final int numDataSchemeSpecificParts = mDataSchemeSpecificParts == null

                ? 0 : mDataSchemeSpecificParts.size();

        for (int i = 0; i < numDataPath; i++) {

            if (!mDataPaths.get(i).check()) {

                return false;

            }

        }

        for (int i = 0; i < numDataSchemeSpecificParts; i++) {

            if (!mDataSchemeSpecificParts.get(i).check()) {

                return false;

            }

        }

        return true;

    }



    /** @hide */

    public IntentFilter(Parcel source) {

        List<String> actions = new ArrayList<>();

core/java/android/os/PatternMatcher.java

+18 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


package android.os;



import android.util.Log;

import android.util.proto.ProtoOutputStream;



import java.util.Arrays;
@@ -151,6 +152,23 @@ public class PatternMatcher implements Parcelable { 
        proto.end(token);

    }



    /**

     * Perform a check on the matcher for the pattern type of {@link #PATTERN_ADVANCED_GLOB}.

     * Return true if it passed.

     * @hide

     */

    public boolean check() {

        try {

            if (mType == PATTERN_ADVANCED_GLOB) {

                return Arrays.equals(mParsedPattern, parseAndVerifyAdvancedPattern(mPattern));

            }

        } catch (IllegalArgumentException e) {

            Log.w(TAG, "Failed to verify advanced pattern: " + e.getMessage());

            return false;

        }

        return true;

    }



    public int describeContents() {

        return 0;

    }

services/core/java/com/android/server/pm/PackageManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -3461,6 +3461,11 @@ public class PackageManagerService implements PackageSender, TestUtilityService 


        PackageManagerServiceUtils.enforceShellRestriction(mInjector.getUserManagerInternal(),

                UserManager.DISALLOW_DEBUGGING_FEATURES, callingUid, sourceUserId);

        if (!intentFilter.checkDataPathAndSchemeSpecificParts()) {

            EventLog.writeEvent(0x534e4554, "246749936", callingUid);

            throw new IllegalArgumentException("Invalid intent data paths or scheme specific parts"

                    + " in the filter.");

        }

        if (intentFilter.countActions() == 0) {

            Slog.w(TAG, "Cannot set a crossProfile intent filter with no filter actions");

            return;

services/core/java/com/android/server/pm/PreferredActivityHelper.java

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import android.os.Build; 
import android.os.Process;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.EventLog;

import android.util.Log;

import android.util.LogPrinter;

import android.util.PrintStreamPrinter;
@@ -387,6 +388,11 @@ final class PreferredActivityHelper { 
            throw new SecurityException(

                    "addPersistentPreferredActivity can only be run by the system");

        }

        if (!filter.checkDataPathAndSchemeSpecificParts()) {

            EventLog.writeEvent(0x534e4554, "246749702", callingUid);

            throw new IllegalArgumentException("Invalid intent data paths or scheme specific parts"

                    + " in the filter.");

        }

        if (filter.countActions() == 0) {

            Slog.w(TAG, "Cannot set a preferred activity with no filter actions");

            return;

services/core/java/com/android/server/pm/WatchedIntentFilter.java

+7 −0
Original line number Diff line number Diff line
@@ -670,6 +670,13 @@ public class WatchedIntentFilter 
        return mFilter.debugCheck();

    }



    /**

     * @see IntentFilter#checkDataPathAndSchemeSpecificParts()

     */

    public boolean checkDataPathAndSchemeSpecificParts() {

        return mFilter.checkDataPathAndSchemeSpecificParts();

    }



    /**

     * @see IntentFilter#getHostsList()

     */