summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRhed Jao <rhedjao@google.com>2022-10-05 00:11:27 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2022-10-05 00:11:27 +0000
commitf6c1d6f7f27b4f72c131cff71d0fb789beafefa4 (patch)
tree7151bf69fb0b3734e2cc4f61e55e2a697786195c
parentb0a0c351b3686c142124c8a8d18952045bb1ae3d (diff)
parentf16c3d6883b6a61b1587bf33d80e25707593cbc8 (diff)
downloadbase-f6c1d6f7f27b4f72c131cff71d0fb789beafefa4.tar.gz
Merge changes from topic "pm_setCmpEnabledSetting_vulnerability" into sc-mainline-prod
* changes: [automerge] [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting 2p: 2447359037 [DO NOT MERGE] Fix permanent denial of service via setComponentEnabledSetting
-rw-r--r--services/core/java/com/android/server/pm/PackageManagerService.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/PackageManagerService.java b/services/core/java/com/android/server/pm/PackageManagerService.java
index 9836679c1dee..139d44928d91 100644
--- a/services/core/java/com/android/server/pm/PackageManagerService.java
+++ b/services/core/java/com/android/server/pm/PackageManagerService.java
@@ -24036,6 +24036,9 @@ public class PackageManagerService extends IPackageManager.Stub
} else {
Slog.w(TAG, "Failed setComponentEnabledSetting: component class "
+ className + " does not exist in " + packageName);
+ // Safetynet logging for b/240936919
+ EventLog.writeEvent(0x534e4554, "240936919", callingUid);
+ return;
}
}
switch (newState) {