Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent inheritKeyStoreKeys from taking effect on system UID apps

Browse Source 
When an app that used to share UID with system decided to leave shared
UID, it should not be allowed to inherit all keys from its previous UID
as that will nuke all system UID keys, breaking critical system
functionality.

Test: manual
Bug: 216560195
Change-Id: I27eea398b7c2ec624f1239aee72755cfb8d50339
This commit is contained in:
John Wu
2022-02-02 14:29:40 -08:00
parent c523daa474
commit b80870eff7
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/pm/AppDataHelper.java
View File

@@ -48,8 +48,8 @@ import com.android.server.SystemServerInitThreadPool;
import com.android.server.pm.dex.ArtManagerService;
import com.android.server.pm.parsing.pkg.AndroidPackage;
import com.android.server.pm.parsing.pkg.AndroidPackageUtils;
import com.android.server.pm.pkg.SELinuxUtil;
import com.android.server.pm.pkg.PackageStateInternal;
import com.android.server.pm.pkg.SELinuxUtil;
import dalvik.system.VMRuntime;
@@ -549,6 +549,10 @@ final class AppDataHelper {
}
public void migrateKeyStoreData(int previousAppId, int appId) {
// If previous UID is system UID, declaring inheritKeyStoreKeys is not supported.
// Silently ignore the request to migrate keys.
if (previousAppId == Process.SYSTEM_UID) return;
for (int userId : mPm.resolveUserIds(UserHandle.USER_ALL)) {
int srcUid = UserHandle.getUid(userId, previousAppId);
int destUid = UserHandle.getUid(userId, appId);