mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-27 00:19:26 -05:00
95 lines
5.0 KiB
Diff
95 lines
5.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tetiana Meronyk <tetianameronyk@google.com>
|
|
Date: Mon, 9 Oct 2023 20:57:11 +0000
|
|
Subject: [PATCH] Truncate user data to a limit of 500 characters
|
|
|
|
Fix vulnerability that allows creating users with no restrictions. This is done by creating an intent to create a user and putting extras that are too long to be serialized. It causes IOException and the restrictions are not written in the file.
|
|
|
|
By truncating the string values when writing them to the file, we ensure that the exception does not happen and it can be recorded correctly.
|
|
|
|
Bug: 293602317
|
|
Test: install app provided in the bug, open app and click add. Check logcat to see there is no more IOException. Reboot the device by either opening User details page or running adb shell dumpsys user | grep -A12 heen and see that the restrictions are in place.
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:46caac641941f2e8865a8d53400f959b3bd98d88)
|
|
Merged-In: Ia71477601d036a3ca55e73cdc9698ae268a30f20
|
|
Change-Id: Ia71477601d036a3ca55e73cdc9698ae268a30f20
|
|
---
|
|
.../android/server/pm/UserManagerService.java | 24 ++++++++++++++-----
|
|
1 file changed, 18 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java
|
|
index cea22bbe46f4..d19a95a5e229 100644
|
|
--- a/services/core/java/com/android/server/pm/UserManagerService.java
|
|
+++ b/services/core/java/com/android/server/pm/UserManagerService.java
|
|
@@ -188,6 +188,8 @@ public class UserManagerService extends IUserManager.Stub {
|
|
|
|
private static final int USER_VERSION = 6;
|
|
|
|
+ private static final int MAX_USER_STRING_LENGTH = 500;
|
|
+
|
|
private static final long EPOCH_PLUS_30_YEARS = 30L * 365 * 24 * 60 * 60 * 1000L; // ms
|
|
|
|
// Maximum number of managed profiles permitted per user is 1. This cannot be increased
|
|
@@ -1921,15 +1923,17 @@ public class UserManagerService extends IUserManager.Stub {
|
|
// Write seed data
|
|
if (userData.persistSeedData) {
|
|
if (userData.seedAccountName != null) {
|
|
- serializer.attribute(null, ATTR_SEED_ACCOUNT_NAME, userData.seedAccountName);
|
|
+ serializer.attribute(null, ATTR_SEED_ACCOUNT_NAME,
|
|
+ truncateString(userData.seedAccountName));
|
|
}
|
|
if (userData.seedAccountType != null) {
|
|
- serializer.attribute(null, ATTR_SEED_ACCOUNT_TYPE, userData.seedAccountType);
|
|
+ serializer.attribute(null, ATTR_SEED_ACCOUNT_TYPE,
|
|
+ truncateString(userData.seedAccountType));
|
|
}
|
|
}
|
|
if (userInfo.name != null) {
|
|
serializer.startTag(null, TAG_NAME);
|
|
- serializer.text(userInfo.name);
|
|
+ serializer.text(truncateString(userInfo.name));
|
|
serializer.endTag(null, TAG_NAME);
|
|
}
|
|
synchronized (mRestrictionsLock) {
|
|
@@ -1961,6 +1965,13 @@ public class UserManagerService extends IUserManager.Stub {
|
|
}
|
|
}
|
|
|
|
+ private String truncateString(String original) {
|
|
+ if (original == null || original.length() <= MAX_USER_STRING_LENGTH) {
|
|
+ return original;
|
|
+ }
|
|
+ return original.substring(0, MAX_USER_STRING_LENGTH);
|
|
+ }
|
|
+
|
|
/*
|
|
* Writes the user list file in this format:
|
|
*
|
|
@@ -2219,6 +2230,7 @@ public class UserManagerService extends IUserManager.Stub {
|
|
if (ActivityManager.isLowRamDeviceStatic()) {
|
|
return null;
|
|
}
|
|
+ String truncatedName = truncateString(name);
|
|
final boolean isGuest = (flags & UserInfo.FLAG_GUEST) != 0;
|
|
final boolean isManagedProfile = (flags & UserInfo.FLAG_MANAGED_PROFILE) != 0;
|
|
final boolean isRestricted = (flags & UserInfo.FLAG_RESTRICTED) != 0;
|
|
@@ -2297,7 +2309,7 @@ public class UserManagerService extends IUserManager.Stub {
|
|
flags |= UserInfo.FLAG_EPHEMERAL;
|
|
}
|
|
|
|
- userInfo = new UserInfo(userId, name, null, flags);
|
|
+ userInfo = new UserInfo(userId, truncatedName, null, flags);
|
|
userInfo.serialNumber = mNextSerialNumber++;
|
|
long now = System.currentTimeMillis();
|
|
userInfo.creationTime = (now > EPOCH_PLUS_30_YEARS) ? now : 0;
|
|
@@ -3095,8 +3107,8 @@ public class UserManagerService extends IUserManager.Stub {
|
|
Slog.e(LOG_TAG, "No such user for settings seed data u=" + userId);
|
|
return;
|
|
}
|
|
- userData.seedAccountName = accountName;
|
|
- userData.seedAccountType = accountType;
|
|
+ userData.seedAccountName = truncateString(accountName);
|
|
+ userData.seedAccountType = truncateString(accountType);
|
|
userData.seedAccountOptions = accountOptions;
|
|
userData.persistSeedData = persist;
|
|
}
|