diff --git a/Patches/LineageOS-15.1/android_frameworks_base/389014-backport.patch b/Patches/LineageOS-15.1/android_frameworks_base/389014-backport.patch new file mode 100644 index 00000000..b95ac887 --- /dev/null +++ b/Patches/LineageOS-15.1/android_frameworks_base/389014-backport.patch @@ -0,0 +1,338 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Tetiana Meronyk +Date: Wed, 10 Jan 2024 16:25:13 +0000 +Subject: [PATCH] Fix security vulnerability that creates user with no + restrictions when accountOptions are too long. + +Bug: 293602970 +Test: atest UserManagerTest#testAddUserAccountData_validStringValuesAreSaved_validBundleIsSaved && atest UserManagerTest#testAddUserAccountData_invalidStringValuesAreTruncated_invalidBundleIsDropped +(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:944ea959ab8464c39a8f6a4fc391fb6953e1df89) +Merged-In: I23c971f671546ac085060add89485cfac6691ca3 +Change-Id: I23c971f671546ac085060add89485cfac6691ca3 +--- + core/java/android/os/PersistableBundle.java | 37 +++++++ + core/java/android/os/UserManager.java | 23 +++- + .../app/ConfirmUserCreationActivity.java | 12 +++ + .../android/server/pm/UserManagerService.java | 29 ++--- + .../android/server/pm/UserManagerTest.java | 102 ++++++++++++++++++ + 5 files changed, 187 insertions(+), 16 deletions(-) + +diff --git a/core/java/android/os/PersistableBundle.java b/core/java/android/os/PersistableBundle.java +index 975b0da06c84..a62a1cb7d495 100644 +--- a/core/java/android/os/PersistableBundle.java ++++ b/core/java/android/os/PersistableBundle.java +@@ -267,6 +267,43 @@ public final class PersistableBundle extends BaseBundle implements Cloneable, Pa + XmlUtils.writeMapXml(mMap, out, this); + } + ++ /** ++ * Checks whether all keys and values are within the given character limit. ++ * Note: Maximum character limit of String that can be saved to XML as part of bundle is 65535. ++ * Otherwise IOException is thrown. ++ * @param limit length of String keys and values in the PersistableBundle, including nested ++ * PersistableBundles to check against. ++ * ++ * @hide ++ */ ++ public boolean isBundleContentsWithinLengthLimit(int limit) { ++ unparcel(); ++ if (mMap == null) { ++ return true; ++ } ++ for (int i = 0; i < mMap.size(); i++) { ++ if (mMap.keyAt(i) != null && mMap.keyAt(i).length() > limit) { ++ return false; ++ } ++ final Object value = mMap.valueAt(i); ++ if (value instanceof String && ((String) value).length() > limit) { ++ return false; ++ } else if (value instanceof String[]) { ++ String[] stringArray = (String[]) value; ++ for (int j = 0; j < stringArray.length; j++) { ++ if (stringArray[j] != null ++ && stringArray[j].length() > limit) { ++ return false; ++ } ++ } ++ } else if (value instanceof PersistableBundle ++ && !((PersistableBundle) value).isBundleContentsWithinLengthLimit(limit)) { ++ return false; ++ } ++ } ++ return true; ++ } ++ + /** @hide */ + static class MyReadMapCallback implements XmlUtils.ReadMapCallback { + @Override +diff --git a/core/java/android/os/UserManager.java b/core/java/android/os/UserManager.java +index c8584c145533..15e82027f46b 100644 +--- a/core/java/android/os/UserManager.java ++++ b/core/java/android/os/UserManager.java +@@ -74,6 +74,21 @@ public class UserManager { + + private Boolean mIsManagedProfileCached; + ++ /** Maximum length of username. ++ * @hide ++ */ ++ public static final int MAX_USER_NAME_LENGTH = 100; ++ ++ /** Maximum length of user property String value. ++ * @hide ++ */ ++ public static final int MAX_ACCOUNT_STRING_LENGTH = 500; ++ ++ /** Maximum length of account options String values. ++ * @hide ++ */ ++ public static final int MAX_ACCOUNT_OPTIONS_LENGTH = 1000; ++ + /** + * @hide + * No user restriction. +@@ -1600,15 +1615,15 @@ public class UserManager { + * time, the preferred user name and account information are used by the setup process for that + * user. + * +- * @param userName Optional name to assign to the user. ++ * @param userName Optional name to assign to the user. Character limit is 100. + * @param accountName Optional account name that will be used by the setup wizard to initialize +- * the user. ++ * the user. Character limit is 500. + * @param accountType Optional account type for the account to be created. This is required +- * if the account name is specified. ++ * if the account name is specified. Character limit is 500. + * @param accountOptions Optional bundle of data to be passed in during account creation in the + * new user via {@link AccountManager#addAccount(String, String, String[], + * Bundle, android.app.Activity, android.accounts.AccountManagerCallback, +- * Handler)}. ++ * Handler)}. Character limit is 1000. + * @return An Intent that can be launched from an Activity. + * @see #USER_CREATION_FAILED_NOT_PERMITTED + * @see #USER_CREATION_FAILED_NO_MORE_USERS +diff --git a/core/java/com/android/internal/app/ConfirmUserCreationActivity.java b/core/java/com/android/internal/app/ConfirmUserCreationActivity.java +index 03da9bc939ec..74dedc38a922 100644 +--- a/core/java/com/android/internal/app/ConfirmUserCreationActivity.java ++++ b/core/java/com/android/internal/app/ConfirmUserCreationActivity.java +@@ -110,6 +110,14 @@ public class ConfirmUserCreationActivity extends AlertActivity + if (cantCreateUser) { + setResult(UserManager.USER_CREATION_FAILED_NOT_PERMITTED); + return null; ++ } else if (!(isUserPropertyWithinLimit(mUserName, UserManager.MAX_USER_NAME_LENGTH) ++ && isUserPropertyWithinLimit(mAccountName, UserManager.MAX_ACCOUNT_STRING_LENGTH) ++ && isUserPropertyWithinLimit(mAccountType, UserManager.MAX_ACCOUNT_STRING_LENGTH)) ++ || (mAccountOptions != null && !mAccountOptions.isBundleContentsWithinLengthLimit( ++ UserManager.MAX_ACCOUNT_OPTIONS_LENGTH))) { ++ setResult(UserManager.USER_CREATION_FAILED_NOT_PERMITTED); ++ Log.i(TAG, "User properties must not exceed their character limits"); ++ return null; + } else if (cantCreateAnyMoreUsers) { + setResult(UserManager.USER_CREATION_FAILED_NO_MORE_USERS); + return null; +@@ -137,4 +145,8 @@ public class ConfirmUserCreationActivity extends AlertActivity + } + finish(); + } ++ ++ private boolean isUserPropertyWithinLimit(String property, int limit) { ++ return property == null || property.length() <= limit; ++ } + } +diff --git a/services/core/java/com/android/server/pm/UserManagerService.java b/services/core/java/com/android/server/pm/UserManagerService.java +index 957af0fbab68..c8e2f756e55a 100644 +--- a/services/core/java/com/android/server/pm/UserManagerService.java ++++ b/services/core/java/com/android/server/pm/UserManagerService.java +@@ -212,8 +212,6 @@ public class UserManagerService extends IUserManager.Stub { + + private static final int USER_VERSION = 7; + +- 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 +@@ -2061,16 +2059,18 @@ public class UserManagerService extends IUserManager.Stub { + if (userData.persistSeedData) { + if (userData.seedAccountName != null) { + serializer.attribute(null, ATTR_SEED_ACCOUNT_NAME, +- truncateString(userData.seedAccountName)); ++ truncateString(userData.seedAccountName, ++ UserManager.MAX_ACCOUNT_STRING_LENGTH)); + } + if (userData.seedAccountType != null) { + serializer.attribute(null, ATTR_SEED_ACCOUNT_TYPE, +- truncateString(userData.seedAccountType)); ++ truncateString(userData.seedAccountType, ++ UserManager.MAX_ACCOUNT_STRING_LENGTH)); + } + } + if (userInfo.name != null) { + serializer.startTag(null, TAG_NAME); +- serializer.text(truncateString(userInfo.name)); ++ serializer.text(truncateString(userInfo.name, UserManager.MAX_USER_NAME_LENGTH)); + serializer.endTag(null, TAG_NAME); + } + synchronized (mRestrictionsLock) { +@@ -2101,11 +2101,11 @@ public class UserManagerService extends IUserManager.Stub { + serializer.endDocument(); + } + +- private String truncateString(String original) { +- if (original == null || original.length() <= MAX_USER_STRING_LENGTH) { ++ private String truncateString(String original, int limit) { ++ if (original == null || original.length() <= limit) { + return original; + } +- return original.substring(0, MAX_USER_STRING_LENGTH); ++ return original.substring(0, limit); + } + + /* +@@ -2396,7 +2396,7 @@ public class UserManagerService extends IUserManager.Stub { + + private UserInfo createUserInternalUnchecked(String name, int flags, int parentId, + String[] disallowedPackages) { +- String truncatedName = truncateString(name); ++ String truncatedName = truncateString(name, UserManager.MAX_USER_NAME_LENGTH); + DeviceStorageMonitorInternal dsm = LocalServices + .getService(DeviceStorageMonitorInternal.class); + if (dsm.isMemoryLow()) { +@@ -3313,9 +3313,14 @@ public class UserManagerService extends IUserManager.Stub { + Slog.e(LOG_TAG, "No such user for settings seed data u=" + userId); + return; + } +- userData.seedAccountName = truncateString(accountName); +- userData.seedAccountType = truncateString(accountType); +- userData.seedAccountOptions = accountOptions; ++ userData.seedAccountName = truncateString(accountName, ++ UserManager.MAX_ACCOUNT_STRING_LENGTH); ++ userData.seedAccountType = truncateString(accountType, ++ UserManager.MAX_ACCOUNT_STRING_LENGTH); ++ if (accountOptions != null && accountOptions.isBundleContentsWithinLengthLimit( ++ UserManager.MAX_ACCOUNT_OPTIONS_LENGTH)) { ++ userData.seedAccountOptions = accountOptions; ++ } + userData.persistSeedData = persist; + } + if (persist) { +diff --git a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +index b656d5e9a343..e57058e31a6f 100644 +--- a/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java ++++ b/services/tests/servicestests/src/com/android/server/pm/UserManagerTest.java +@@ -24,6 +24,7 @@ import android.content.pm.PackageManager; + import android.content.pm.UserInfo; + import android.app.ActivityManager; + import android.os.Bundle; ++import android.os.PersistableBundle; + import android.os.UserHandle; + import android.os.UserManager; + import android.provider.Settings; +@@ -506,6 +507,107 @@ public class UserManagerTest extends AndroidTestCase { + assertEquals(canBeCreatedCount, created.get()); + } + ++ @Test ++ public void testAddUserAccountData_validStringValuesAreSaved_validBundleIsSaved() { ++ assumeManagedUsersSupported(); ++ ++ String userName = "User"; ++ String accountName = "accountName"; ++ String accountType = "accountType"; ++ String arrayKey = "StringArrayKey"; ++ String stringKey = "StringKey"; ++ String intKey = "IntKey"; ++ String nestedBundleKey = "PersistableBundleKey"; ++ String value1 = "Value 1"; ++ String value2 = "Value 2"; ++ String value3 = "Value 3"; ++ ++ UserInfo userInfo = mUserManager.createUser(userName, ++ UserManager.USER_TYPE_FULL_SECONDARY, 0); ++ ++ PersistableBundle accountOptions = new PersistableBundle(); ++ String[] stringArray = {value1, value2}; ++ accountOptions.putInt(intKey, 1234); ++ PersistableBundle nested = new PersistableBundle(); ++ nested.putString(stringKey, value3); ++ accountOptions.putPersistableBundle(nestedBundleKey, nested); ++ accountOptions.putStringArray(arrayKey, stringArray); ++ ++ mUserManager.clearSeedAccountData(); ++ mUserManager.setSeedAccountData(mContext.getUserId(), accountName, ++ accountType, accountOptions); ++ ++ //assert userName accountName and accountType were saved correctly ++ assertTrue(mUserManager.getUserInfo(userInfo.id).name.equals(userName)); ++ assertTrue(mUserManager.getSeedAccountName().equals(accountName)); ++ assertTrue(mUserManager.getSeedAccountType().equals(accountType)); ++ ++ //assert bundle with correct values was added ++ assertThat(mUserManager.getSeedAccountOptions().containsKey(arrayKey)).isTrue(); ++ assertThat(mUserManager.getSeedAccountOptions().getPersistableBundle(nestedBundleKey) ++ .getString(stringKey)).isEqualTo(value3); ++ assertThat(mUserManager.getSeedAccountOptions().getStringArray(arrayKey)[0]) ++ .isEqualTo(value1); ++ ++ mUserManager.removeUser(userInfo.id); ++ } ++ ++ @Test ++ public void testAddUserAccountData_invalidStringValuesAreTruncated_invalidBundleIsDropped() { ++ assumeManagedUsersSupported(); ++ ++ String tooLongString = generateLongString(); ++ String userName = "User " + tooLongString; ++ String accountType = "Account Type " + tooLongString; ++ String accountName = "accountName " + tooLongString; ++ String arrayKey = "StringArrayKey"; ++ String stringKey = "StringKey"; ++ String intKey = "IntKey"; ++ String nestedBundleKey = "PersistableBundleKey"; ++ String value1 = "Value 1"; ++ String value2 = "Value 2"; ++ ++ UserInfo userInfo = mUserManager.createUser(userName, ++ UserManager.USER_TYPE_FULL_SECONDARY, 0); ++ ++ PersistableBundle accountOptions = new PersistableBundle(); ++ String[] stringArray = {value1, value2}; ++ accountOptions.putInt(intKey, 1234); ++ PersistableBundle nested = new PersistableBundle(); ++ nested.putString(stringKey, tooLongString); ++ accountOptions.putPersistableBundle(nestedBundleKey, nested); ++ accountOptions.putStringArray(arrayKey, stringArray); ++ mUserManager.clearSeedAccountData(); ++ mUserManager.setSeedAccountData(mContext.getUserId(), accountName, ++ accountType, accountOptions); ++ ++ //assert userName was truncated ++ assertTrue(mUserManager.getUserInfo(userInfo.id).name.length() ++ == UserManager.MAX_USER_NAME_LENGTH); ++ ++ //assert accountName and accountType got truncated ++ assertTrue(mUserManager.getSeedAccountName().length() ++ == UserManager.MAX_ACCOUNT_STRING_LENGTH); ++ assertTrue(mUserManager.getSeedAccountType().length() ++ == UserManager.MAX_ACCOUNT_STRING_LENGTH); ++ ++ //assert bundle with invalid values was dropped ++ assertThat(mUserManager.getSeedAccountOptions() == null).isTrue(); ++ ++ mUserManager.removeUser(userInfo.id); ++ } ++ ++ private String generateLongString() { ++ String partialString = "Test Name Test Name Test Name Test Name Test Name Test Name Test " ++ + "Name Test Name Test Name Test Name "; //String of length 100 ++ StringBuilder resultString = new StringBuilder(); ++ for (int i = 0; i < 600; i++) { ++ resultString.append(partialString); ++ } ++ return resultString.toString(); ++ } ++ ++ + private boolean isPackageInstalledForUser(String packageName, int userId) { + try { + return mPackageManager.getPackageInfoAsUser(packageName, 0, userId) != null; diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 37fa9ade..ea380010 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -63,7 +63,7 @@ commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" commentPatches android_kernel_google_redbull.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600"; commentPatches android_kernel_google_sunfish.sh "CVE-2021-30324"; commentPatches android_kernel_google_wahoo.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2021-30324"; -commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514"; +commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514" "CVE-2021-47122"; commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559"; commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514" "CVE-2018-14614/3.4"; commentPatches android_kernel_htc_msm8960.sh "CVE-2018-10876" "CVE-2021-0695" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 43c0a2fd..ceedfd83 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -74,7 +74,7 @@ applyPatch "$DOS_PATCHES/android_build/0002-Enable_fwrapv.patch"; #Use -fwrapv a applyPatch "$DOS_PATCHES/android_build/0003-verity-openssl3.patch"; #Fix VB 1.0 failure due to openssl output format change sed -i '57i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aapt2.mk; #Enable auto-add-overlay for packages, this allows the vendor overlay to easily work across all branches. awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2021-10-05/2024-03-05/' core/version_defaults.mk; #Bump Security String #XXX +sed -i 's/2021-10-05/2024-04-05/' core/version_defaults.mk; #Bump Security String #XXX fi; if enterAndClear "build/soong"; then @@ -240,6 +240,7 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/379136.patch"; #R_asb_2024-01 F applyPatch "$DOS_PATCHES/android_frameworks_base/385672.patch"; #P_asb_2024-03 Resolve custom printer icon boundary exploit. applyPatch "$DOS_PATCHES/android_frameworks_base/385673.patch"; #P_asb_2024-03 Disallow system apps to be installed/updated as instant. applyPatch "$DOS_PATCHES/android_frameworks_base/385674.patch"; #P_asb_2024-03 Close AccountManagerService.session after timeout. +applyPatch "$DOS_PATCHES/android_frameworks_base/389014-backport.patch"; #S_asb_2024-04 Fix security vulnerability that creates user with no restrictions when accountOptions are too long. applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0001-Browser_No_Location.patch"; #Don't grant location permission to system browsers (GrapheneOS) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0003-SUPL_No_IMSI.patch"; #Don't send IMSI to SUPL (MSe1969) applyPatch "$DOS_PATCHES_COMMON/android_frameworks_base/0004-Fingerprint_Lockout.patch"; #Enable fingerprint lockout after five failed attempts (GrapheneOS) diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh index d9ae6905..5f178b96 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh @@ -460,7 +460,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47114/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47117/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47118/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47121/3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47122/3.18/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47122/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47145/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47149/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47153/3.18/0001.patch