commit 6dab15262bc864030d6f657e106fbbee6bfa3f4c
author Sumedh Sen <sumedhsen@google.com> Wed Jul 17 17:42:43 2024 +0000
committer Sumedh Sen <sumedhsen@google.com> Wed Jul 31 21:36:38 2024 +0000
tree 3c0b6df8bb181c0e617e308db402a00bf8cb0103
parent 4f0ff92be9ba8322420aeac8cb017a4a1159e3d1

[RESTRICT AUTOMERGE] Check whether installerPackageName contains only valid characters

Bug: 341256391
Bug: 307532206
Test: sts-tradefed run sts-dynamic-develop -m CtsSecurityTestCases -t android.security.cts.CVE_2024_0044

Change-Id: I74a172c617d6f5b13f0708092156b657b73b5891

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

diff --git a/services/core/java/com/android/server/pm/PackageInstallerService.java b/services/core/java/com/android/server/pm/PackageInstallerService.java
index c5b82a4..024af75 100644
--- a/services/core/java/com/android/server/pm/PackageInstallerService.java
+++ b/services/core/java/com/android/server/pm/PackageInstallerService.java
@@ -640,13 +640,18 @@
         params.appLabel = TextUtils.trimToSize(params.appLabel,
                 PackageItemInfo.MAX_SAFE_LABEL_LENGTH);
 
-        // Validate installer package name.
+        // Validate requested installer package name.
         if (params.installerPackageName != null && !isValidPackageName(
                 params.installerPackageName)) {
             params.installerPackageName = null;
         }
 
-        var requestedInstallerPackageName =
+        // Validate installer package name.
+        if (installerPackageName != null && !isValidPackageName(installerPackageName)) {
+            installerPackageName = null;
+        }
+
+        String requestedInstallerPackageName =
                 params.installerPackageName != null ? params.installerPackageName
                         : installerPackageName;