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

Commit c45b6a14 authored by Mohammad Samiul Islam's avatar Mohammad Samiul Islam
Browse files

Fix deadlock in StagingManager.getSessions() method 

When we stage a session we acquire the PackageInstallerSession#mLock
first and then StagingManager#mStagedSessions lock. But in getSessions()
method, we acquire the locks in reverse order which can lead to
deadlock.

Bug: 160113544
Test: atest StagedInstallTest
Change-Id: I7a1abf44db27d4673d43e9b0886610a5bd8b41f6
parent 7d8bf624

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

+10 −1
Original line number Diff line number Diff line
@@ -869,7 +869,16 @@ public class PackageInstallerService extends IPackageInstaller.Stub implements 


    @Override

    public ParceledListSlice<SessionInfo> getStagedSessions() {

        return mStagingManager.getSessions(Binder.getCallingUid());

        final List<SessionInfo> result = new ArrayList<>();

        synchronized (mSessions) {

            for (int i = 0; i < mSessions.size(); i++) {

                final PackageInstallerSession session = mSessions.valueAt(i);

                if (session.isStaged() && !session.isDestroyed()) {

                    result.add(session.generateInfoForCaller(false, Binder.getCallingUid()));

                }

            }

        }

        return new ParceledListSlice<>(result);

    }



    @Override

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

+0 −15
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ import android.content.pm.PackageManagerInternal; 
import android.content.pm.PackageParser.PackageParserException;

import android.content.pm.PackageParser.SigningDetails;

import android.content.pm.PackageParser.SigningDetails.SignatureSchemeVersion;

import android.content.pm.ParceledListSlice;

import android.content.pm.parsing.PackageInfoWithoutStateUtils;

import android.content.rollback.RollbackInfo;

import android.content.rollback.RollbackManager;
@@ -184,20 +183,6 @@ public class StagingManager { 
        mApexManager.markBootCompleted();

    }



    ParceledListSlice<PackageInstaller.SessionInfo> getSessions(int callingUid) {

        final List<PackageInstaller.SessionInfo> result = new ArrayList<>();

        synchronized (mStagedSessions) {

            for (int i = 0; i < mStagedSessions.size(); i++) {

                final PackageInstallerSession stagedSession = mStagedSessions.valueAt(i);

                if (stagedSession.isDestroyed()) {

                    continue;

                }

                result.add(stagedSession.generateInfoForCaller(false /*icon*/, callingUid));

            }

        }

        return new ParceledListSlice<>(result);

    }



    /**

     * Validates the signature used to sign the container of the new apex package

     *