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

Commit 865fd3a5 authored by Patrick Baumann's avatar Patrick Baumann
Browse files

mPackages is not a lock! 

This change breaks the dual purpose of mPackages into two fields:
mPackages as a proper map of packages and mLock as the lock of state
throughout PackageMangerService.

Bug: 137881067
Fixes: 137961986
Test: atest AppSecurityTest
Change-Id: I767dfccd3984db9d8cf45fc482a2fd214f1124e4
parent 173aa7a6

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

+24 −24
Original line number Original line Diff line number Diff line
@@ -112,7 +112,7 @@ class InstantAppRegistry { 
    private final CookiePersistence mCookiePersistence;

    private final CookiePersistence mCookiePersistence;





    /** State for uninstalled instant apps */

    /** State for uninstalled instant apps */

    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private SparseArray<List<UninstalledInstantAppState>> mUninstalledInstantApps;

    private SparseArray<List<UninstalledInstantAppState>> mUninstalledInstantApps;





    /**

    /**
@@ -121,11 +121,11 @@ class InstantAppRegistry { 
     * The value is a set of instant app UIDs.

     * The value is a set of instant app UIDs.

     * UserID -> TargetAppId -> InstantAppId

     * UserID -> TargetAppId -> InstantAppId

     */

     */

    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private SparseArray<SparseArray<SparseBooleanArray>> mInstantGrants;

    private SparseArray<SparseArray<SparseBooleanArray>> mInstantGrants;





    /** The set of all installed instant apps. UserID -> AppID */

    /** The set of all installed instant apps. UserID -> AppID */

    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private SparseArray<SparseBooleanArray> mInstalledInstantAppUids;

    private SparseArray<SparseBooleanArray> mInstalledInstantAppUids;





    public InstantAppRegistry(PackageManagerService service) {

    public InstantAppRegistry(PackageManagerService service) {
@@ -133,7 +133,7 @@ class InstantAppRegistry { 
        mCookiePersistence = new CookiePersistence(BackgroundThread.getHandler().getLooper());

        mCookiePersistence = new CookiePersistence(BackgroundThread.getHandler().getLooper());

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public byte[] getInstantAppCookieLPw(@NonNull String packageName,

    public byte[] getInstantAppCookieLPw(@NonNull String packageName,

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        // Only installed packages can get their own cookie

        // Only installed packages can get their own cookie
@@ -157,7 +157,7 @@ class InstantAppRegistry { 
        return null;

        return null;

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public boolean setInstantAppCookieLPw(@NonNull String packageName,

    public boolean setInstantAppCookieLPw(@NonNull String packageName,

            @Nullable byte[] cookie, @UserIdInt int userId) {

            @Nullable byte[] cookie, @UserIdInt int userId) {

        if (cookie != null && cookie.length > 0) {

        if (cookie != null && cookie.length > 0) {
@@ -182,7 +182,7 @@ class InstantAppRegistry { 




    private void persistInstantApplicationCookie(@Nullable byte[] cookie,

    private void persistInstantApplicationCookie(@Nullable byte[] cookie,

            @NonNull String packageName, @NonNull File cookieFile, @UserIdInt int userId) {

            @NonNull String packageName, @NonNull File cookieFile, @UserIdInt int userId) {

        synchronized (mService.mPackages) {

        synchronized (mService.mLock) {

            File appDir = getInstantApplicationDir(packageName, userId);

            File appDir = getInstantApplicationDir(packageName, userId);

            if (!appDir.exists() && !appDir.mkdirs()) {

            if (!appDir.exists() && !appDir.mkdirs()) {

                Slog.e(LOG_TAG, "Cannot create instant app cookie directory");

                Slog.e(LOG_TAG, "Cannot create instant app cookie directory");
@@ -250,7 +250,7 @@ class InstantAppRegistry { 




    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public @Nullable List<InstantAppInfo> getInstantAppsLPr(@UserIdInt int userId) {

    public @Nullable List<InstantAppInfo> getInstantAppsLPr(@UserIdInt int userId) {

        List<InstantAppInfo> installedApps = getInstalledInstantApplicationsLPr(userId);

        List<InstantAppInfo> installedApps = getInstalledInstantApplicationsLPr(userId);

        List<InstantAppInfo> uninstalledApps = getUninstalledInstantApplicationsLPr(userId);

        List<InstantAppInfo> uninstalledApps = getUninstalledInstantApplicationsLPr(userId);
@@ -263,7 +263,7 @@ class InstantAppRegistry { 
        return uninstalledApps;

        return uninstalledApps;

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void onPackageInstalledLPw(@NonNull PackageParser.Package pkg, @NonNull int[] userIds) {

    public void onPackageInstalledLPw(@NonNull PackageParser.Package pkg, @NonNull int[] userIds) {

        PackageSetting ps = (PackageSetting) pkg.mExtras;

        PackageSetting ps = (PackageSetting) pkg.mExtras;

        if (ps == null) {

        if (ps == null) {
@@ -334,7 +334,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void onPackageUninstalledLPw(@NonNull PackageParser.Package pkg,

    public void onPackageUninstalledLPw(@NonNull PackageParser.Package pkg,

            @NonNull int[] userIds) {

            @NonNull int[] userIds) {

        PackageSetting ps = (PackageSetting) pkg.mExtras;

        PackageSetting ps = (PackageSetting) pkg.mExtras;
@@ -360,7 +360,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void onUserRemovedLPw(int userId) {

    public void onUserRemovedLPw(int userId) {

        if (mUninstalledInstantApps != null) {

        if (mUninstalledInstantApps != null) {

            mUninstalledInstantApps.remove(userId);

            mUninstalledInstantApps.remove(userId);
@@ -399,7 +399,7 @@ class InstantAppRegistry { 
        return instantGrantList.get(instantAppId);

        return instantGrantList.get(instantAppId);

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void grantInstantAccessLPw(@UserIdInt int userId, @Nullable Intent intent,

    public void grantInstantAccessLPw(@UserIdInt int userId, @Nullable Intent intent,

            int targetAppId, int instantAppId) {

            int targetAppId, int instantAppId) {

        if (mInstalledInstantAppUids == null) {

        if (mInstalledInstantAppUids == null) {
@@ -434,7 +434,7 @@ class InstantAppRegistry { 
        instantGrantList.put(instantAppId, true /*granted*/);

        instantGrantList.put(instantAppId, true /*granted*/);

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void addInstantAppLPw(@UserIdInt int userId, int instantAppId) {

    public void addInstantAppLPw(@UserIdInt int userId, int instantAppId) {

        if (mInstalledInstantAppUids == null) {

        if (mInstalledInstantAppUids == null) {

            mInstalledInstantAppUids = new SparseArray<>();

            mInstalledInstantAppUids = new SparseArray<>();
@@ -447,7 +447,7 @@ class InstantAppRegistry { 
        instantAppList.put(instantAppId, true /*installed*/);

        instantAppList.put(instantAppId, true /*installed*/);

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private void removeInstantAppLPw(@UserIdInt int userId, int instantAppId) {

    private void removeInstantAppLPw(@UserIdInt int userId, int instantAppId) {

        // remove from the installed list

        // remove from the installed list

        if (mInstalledInstantAppUids == null) {

        if (mInstalledInstantAppUids == null) {
@@ -473,7 +473,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private void removeAppLPw(@UserIdInt int userId, int targetAppId) {

    private void removeAppLPw(@UserIdInt int userId, int targetAppId) {

        // remove from the installed list

        // remove from the installed list

        if (mInstantGrants == null) {

        if (mInstantGrants == null) {
@@ -486,7 +486,7 @@ class InstantAppRegistry { 
        targetAppList.delete(targetAppId);

        targetAppList.delete(targetAppId);

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private void addUninstalledInstantAppLPw(@NonNull PackageParser.Package pkg,

    private void addUninstalledInstantAppLPw(@NonNull PackageParser.Package pkg,

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        InstantAppInfo uninstalledApp = createInstantAppInfoForPackage(

        InstantAppInfo uninstalledApp = createInstantAppInfoForPackage(
@@ -541,13 +541,13 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    boolean hasInstantApplicationMetadataLPr(String packageName, int userId) {

    boolean hasInstantApplicationMetadataLPr(String packageName, int userId) {

        return hasUninstalledInstantAppStateLPr(packageName, userId)

        return hasUninstalledInstantAppStateLPr(packageName, userId)

                || hasInstantAppMetadataLPr(packageName, userId);

                || hasInstantAppMetadataLPr(packageName, userId);

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    public void deleteInstantApplicationMetadataLPw(@NonNull String packageName,

    public void deleteInstantApplicationMetadataLPw(@NonNull String packageName,

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        removeUninstalledInstantAppStateLPw((UninstalledInstantAppState state) ->

        removeUninstalledInstantAppStateLPw((UninstalledInstantAppState state) ->
@@ -564,7 +564,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private void removeUninstalledInstantAppStateLPw(

    private void removeUninstalledInstantAppStateLPw(

            @NonNull Predicate<UninstalledInstantAppState> criteria, @UserIdInt int userId) {

            @NonNull Predicate<UninstalledInstantAppState> criteria, @UserIdInt int userId) {

        if (mUninstalledInstantApps == null) {

        if (mUninstalledInstantApps == null) {
@@ -592,7 +592,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private boolean hasUninstalledInstantAppStateLPr(String packageName, @UserIdInt int userId) {

    private boolean hasUninstalledInstantAppStateLPr(String packageName, @UserIdInt int userId) {

        if (mUninstalledInstantApps == null) {

        if (mUninstalledInstantApps == null) {

            return false;

            return false;
@@ -685,7 +685,7 @@ class InstantAppRegistry { 
        final long now = System.currentTimeMillis();

        final long now = System.currentTimeMillis();





        // Prune first installed instant apps

        // Prune first installed instant apps

        synchronized (mService.mPackages) {

        synchronized (mService.mLock) {

            allUsers = PackageManagerService.sUserManager.getUserIds();

            allUsers = PackageManagerService.sUserManager.getUserIds();





            final int packageCount = mService.mPackages.size();

            final int packageCount = mService.mPackages.size();
@@ -768,7 +768,7 @@ class InstantAppRegistry { 
        }

        }





        // Prune uninstalled instant apps

        // Prune uninstalled instant apps

        synchronized (mService.mPackages) {

        synchronized (mService.mLock) {

            // TODO: Track last used time for uninstalled instant apps for better pruning

            // TODO: Track last used time for uninstalled instant apps for better pruning

            for (int userId : UserManagerService.getInstance().getUserIds()) {

            for (int userId : UserManagerService.getInstance().getUserIds()) {

                // Prune in-memory state

                // Prune in-memory state
@@ -811,7 +811,7 @@ class InstantAppRegistry { 
        return false;

        return false;

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private @Nullable List<InstantAppInfo> getInstalledInstantApplicationsLPr(

    private @Nullable List<InstantAppInfo> getInstalledInstantApplicationsLPr(

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        List<InstantAppInfo> result = null;

        List<InstantAppInfo> result = null;
@@ -866,7 +866,7 @@ class InstantAppRegistry { 
        }

        }

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private @Nullable List<InstantAppInfo> getUninstalledInstantApplicationsLPr(

    private @Nullable List<InstantAppInfo> getUninstalledInstantApplicationsLPr(

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        List<UninstalledInstantAppState> uninstalledAppStates =

        List<UninstalledInstantAppState> uninstalledAppStates =
@@ -939,7 +939,7 @@ class InstantAppRegistry { 
        return uninstalledAppState.mInstantAppInfo;

        return uninstalledAppState.mInstantAppInfo;

    }

    }





    @GuardedBy("mService.mPackages")

    @GuardedBy("mService.mLock")

    private @Nullable List<UninstalledInstantAppState> getUninstalledInstantAppStatesLPr(

    private @Nullable List<UninstalledInstantAppState> getUninstalledInstantAppStatesLPr(

            @UserIdInt int userId) {

            @UserIdInt int userId) {

        List<UninstalledInstantAppState> uninstalledAppStates = null;

        List<UninstalledInstantAppState> uninstalledAppStates = null;

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ public class OtaDexoptService extends IOtaDexopt.Stub { 
        }

        }

        final List<PackageParser.Package> important;

        final List<PackageParser.Package> important;

        final List<PackageParser.Package> others;

        final List<PackageParser.Package> others;

        synchronized (mPackageManagerService.mPackages) {

        synchronized (mPackageManagerService.mLock) {

            // Important: the packages we need to run with ab-ota compiler-reason.

            // Important: the packages we need to run with ab-ota compiler-reason.

            important = PackageManagerServiceUtils.getPackagesForDexopt(

            important = PackageManagerServiceUtils.getPackagesForDexopt(

                    mPackageManagerService.mPackages.values(), mPackageManagerService,

                    mPackageManagerService.mPackages.values(), mPackageManagerService,

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

+379 −374

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -4020,7 +4020,7 @@ public final class Settings { 
        String[] seinfos;

        String[] seinfos;

        int[] targetSdkVersions;

        int[] targetSdkVersions;

        int packagesCount;

        int packagesCount;

        synchronized (mPackages) {

        synchronized (mLock) {

            Collection<PackageSetting> packages = mPackages.values();

            Collection<PackageSetting> packages = mPackages.values();

            packagesCount = packages.size();

            packagesCount = packages.size();

            volumeUuids = new String[packagesCount];

            volumeUuids = new String[packagesCount];
@@ -4064,7 +4064,7 @@ public final class Settings { 
                Slog.w(TAG, "Failed to prepare app data", e);

                Slog.w(TAG, "Failed to prepare app data", e);

            }

            }

        }

        }

        synchronized (mPackages) {

        synchronized (mLock) {

            applyDefaultPreferredAppsLPw(userHandle);

            applyDefaultPreferredAppsLPw(userHandle);

        }

        }

    }

    }

services/core/java/com/android/server/pm/permission/PermissionManagerService.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1451,7 +1451,7 @@ public class PermissionManagerService extends IPermissionManager.Stub { 
     * @param pkg The package for which to reset.

     * @param pkg The package for which to reset.

     * @param userId The device user for which to do a reset.

     * @param userId The device user for which to do a reset.

     */

     */

    @GuardedBy("mPackages")

    @GuardedBy("mLock")

    private void resetRuntimePermissionsInternal(final PackageParser.Package pkg,

    private void resetRuntimePermissionsInternal(final PackageParser.Package pkg,

            final int userId) {

            final int userId) {

        final String packageName = pkg.packageName;

        final String packageName = pkg.packageName;