diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-13 15:29:52 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-02-13 15:29:52 +0000 |
commit | 6dbcd695401c6b7227f9b4fbfe256c5d0af21722 (patch) | |
tree | a9d53e7ef259dd05ba13992f663dc309d61c7f91 | |
parent | 7ef86819fc085dce28962c9a5008b7c86406f70a (diff) | |
parent | b59cbdd31436d144141d494cfd2718f4315a956a (diff) | |
download | base-6dbcd695401c6b7227f9b4fbfe256c5d0af21722.tar.gz |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/19829996'] into sparse-9583930-L95100000958584662.
SPARSE_CHANGE: I56c2fc14f906cdad80181ab577e2ebc276c151c1
Change-Id: I5620b0c507322026f3e64aac0c411b6b1373610a
-rw-r--r-- | services/core/java/com/android/server/pm/UserManagerService.java | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java index 866a995585cd..88aeb17dc2b4 100644 --- a/services/core/java/com/android/server/pm/UserManagerService.java +++ b/services/core/java/com/android/server/pm/UserManagerService.java @@ -96,6 +96,7 @@ import android.text.TextUtils; import android.util.ArrayMap; import android.util.ArraySet; import android.util.AtomicFile; +import android.util.EventLog; import android.util.IndentingPrintWriter; import android.util.IntArray; import android.util.Slog; @@ -5028,6 +5029,13 @@ public class UserManagerService extends IUserManager.Stub { public void setApplicationRestrictions(String packageName, Bundle restrictions, @UserIdInt int userId) { checkSystemOrRoot("set application restrictions"); + String validationResult = validateName(packageName); + if (validationResult != null) { + if (packageName.contains("../")) { + EventLog.writeEvent(0x534e4554, "239701237", -1, ""); + } + throw new IllegalArgumentException("Invalid package name: " + validationResult); + } if (restrictions != null) { restrictions.setDefusable(true); } @@ -5054,6 +5062,39 @@ public class UserManagerService extends IUserManager.Stub { mContext.sendBroadcastAsUser(changeIntent, UserHandle.of(userId)); } + /** + * Check if the given name is valid. + * + * Note: the logic is taken from FrameworkParsingPackageUtils in master, edited to remove + * unnecessary parts. Copied here for a security fix. + * + * @param name The name to check. + * @return null if it's valid, error message if not + */ + @VisibleForTesting + static String validateName(String name) { + final int n = name.length(); + boolean front = true; + for (int i = 0; i < n; i++) { + final char c = name.charAt(i); + if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) { + front = false; + continue; + } + if (!front) { + if ((c >= '0' && c <= '9') || c == '_') { + continue; + } + if (c == '.') { + front = true; + continue; + } + } + return "bad character '" + c + "'"; + } + return null; + } + private int getUidForPackage(String packageName) { final long ident = Binder.clearCallingIdentity(); try { |