From b7ce879d83275acb75eb6ba27b26ead5d27fa656 Mon Sep 17 00:00:00 2001 From: Tavi Date: Sat, 10 Feb 2024 12:41:35 -0500 Subject: [PATCH] Picks Signed-off-by: Tavi --- .../0005-User_Logout-a1.patch | 4 ++-- .../android_frameworks_base/0005-User_Logout.patch | 4 ++-- .../0014-Automatic_Reboot.patch | 4 ++-- .../0015-Bluetooth_Timeout.patch | 4 ++-- .../android_frameworks_base/0015-WiFi_Timeout.patch | 4 ++-- .../android_frameworks_base/0032-SUPL_Toggle.patch | 4 ++-- .../0041-tile_restrictions.patch | 6 +++--- .../0001-Remove_Analytics.patch | 4 ++-- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 13 ++----------- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 2 +- .../android_kernel_samsung_exynos9810.sh | 2 +- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 2 +- Scripts/LineageOS-20.0/Functions.sh | 1 + 18 files changed, 28 insertions(+), 36 deletions(-) diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch index 248e8068..78724203 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout-a1.patch @@ -10,10 +10,10 @@ in both callers of this method (both of which are "End session" buttons), making 1 file changed, 6 insertions(+) diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index 2b609d990737..5c86c830b106 100644 +index c1da90d85e42..76dabbb24868 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -11192,6 +11192,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -11182,6 +11182,12 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { Preconditions.checkCallAuthorization(canManageUsers(caller) || hasCallingOrSelfPermission(permission.INTERACT_ACROSS_USERS)); diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch index 99a99eb4..4298a7fe 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0005-User_Logout.patch @@ -23,10 +23,10 @@ index 0c69067ab131..ef3213b68bfe 100644 // one notification after enabling + one more after reboots static final int DEF_MAXIMUM_NETWORK_LOGGING_NOTIFICATIONS_SHOWN = 2; diff --git a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -index 7947078e261f..2b609d990737 100644 +index 313c4242f25e..c1da90d85e42 100644 --- a/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java +++ b/services/devicepolicy/java/com/android/server/devicepolicy/DevicePolicyManagerService.java -@@ -16132,11 +16132,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { +@@ -16122,11 +16122,11 @@ public class DevicePolicyManagerService extends BaseIDevicePolicyManager { @Override public boolean isLogoutEnabled() { if (!mHasFeature) { diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch index 52eab72c..b05e98f7 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0014-Automatic_Reboot.patch @@ -13,10 +13,10 @@ Change-Id: If891bfbcc144c9336ba013260bad2b7c7a59c054 4 files changed, 47 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 4c80a5924eb9..726f5fc8d5f6 100644 +index 4578eecd7d45..a540c233b0e0 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17361,6 +17361,14 @@ public final class Settings { +@@ -17368,6 +17368,14 @@ public final class Settings { public static final String REVIEW_PERMISSIONS_NOTIFICATION_STATE = "review_permissions_notification_state"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch index 0a8e1d24..7a6fd023 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-Bluetooth_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/BluetoothAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 463387531037..6692d09c17c4 100644 +index fca7ea0703e8..2f8fc0d12099 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17375,6 +17375,12 @@ public final class Settings { +@@ -17382,6 +17382,12 @@ public final class Settings { */ public static final String WIFI_OFF_TIMEOUT = "wifi_off_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch index c065c981..ada135c6 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0015-WiFi_Timeout.patch @@ -12,10 +12,10 @@ Co-authored-by: Pratyush create mode 100644 services/core/java/com/android/server/ext/WifiAutoOff.java diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 726f5fc8d5f6..463387531037 100644 +index a540c233b0e0..fca7ea0703e8 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17369,6 +17369,12 @@ public final class Settings { +@@ -17376,6 +17376,12 @@ public final class Settings { */ public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0032-SUPL_Toggle.patch b/Patches/LineageOS-20.0/android_frameworks_base/0032-SUPL_Toggle.patch index 1933993d..78fae65c 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0032-SUPL_Toggle.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0032-SUPL_Toggle.patch @@ -11,10 +11,10 @@ Change-Id: I5c31c319d198f09ace493e601278f8224a259f05 3 files changed, 40 insertions(+) diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java -index 6692d09c17c4..cff4ec23b844 100644 +index 2f8fc0d12099..3241e6e3f0cb 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java -@@ -17369,6 +17369,15 @@ public final class Settings { +@@ -17376,6 +17376,15 @@ public final class Settings { */ public static final String SETTINGS_REBOOT_AFTER_TIMEOUT = "settings_reboot_after_timeout"; diff --git a/Patches/LineageOS-20.0/android_frameworks_base/0041-tile_restrictions.patch b/Patches/LineageOS-20.0/android_frameworks_base/0041-tile_restrictions.patch index 9acfd93f..18a08930 100644 --- a/Patches/LineageOS-20.0/android_frameworks_base/0041-tile_restrictions.patch +++ b/Patches/LineageOS-20.0/android_frameworks_base/0041-tile_restrictions.patch @@ -419,7 +419,7 @@ index 92d3956ea303..6ca5073dfa85 100644 return; } diff --git a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java -index 8888c733c3c1..3c9aef445efe 100644 +index 093aba6fd2c9..246c16e7901f 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java +++ b/packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java @@ -48,6 +48,7 @@ import com.android.systemui.qs.SettingObserver; @@ -439,7 +439,7 @@ index 8888c733c3c1..3c9aef445efe 100644 BatteryController.BatteryStateChangeCallback { public static final String TILE_SPEC = "rotation"; -@@ -81,10 +82,11 @@ public class RotationLockTile extends QSTileImpl implements +@@ -84,10 +85,11 @@ public class RotationLockTile extends QSTileImpl implements RotationLockController rotationLockController, SensorPrivacyManager privacyManager, BatteryController batteryController, @@ -453,7 +453,7 @@ index 8888c733c3c1..3c9aef445efe 100644 mController = rotationLockController; mController.observe(this, mCallback); mPrivacyManager = privacyManager; -@@ -126,7 +128,11 @@ public class RotationLockTile extends QSTileImpl implements +@@ -129,7 +131,11 @@ public class RotationLockTile extends QSTileImpl implements } @Override diff --git a/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch index 54813a62..0fa2a821 100644 --- a/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch +++ b/Patches/LineageOS-20.0/android_packages_apps_LineageParts/0001-Remove_Analytics.patch @@ -14,10 +14,10 @@ Change-Id: Ic01c97d6ceac8d324609763973639b41b4581a76 6 files changed, 56 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml -index 44e8323..972ba36 100644 +index 35574d2..ea68c4f 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml -@@ -258,28 +258,6 @@ +@@ -269,28 +269,6 @@ android:resource="@string/summary_empty" /> diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 5fa56134..b2a21e1d 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -145,7 +145,7 @@ done declare -a fourDotNine=("${fourDotFour[@]}" "android_kernel_fairphone_sdm632.sh" "android_kernel_google_msm-4.9.sh" "android_kernel_oneplus_sdm845.sh" "android_kernel_razer_sdm845.sh" "android_kernel_samsung_exynos9810.sh" "android_kernel_samsung_universal9810.sh" "android_kernel_sony_sdm845.sh" "android_kernel_xiaomi_msm8937.sh" "android_kernel_xiaomi_sdm845.sh"); for script in "${fourDotNine[@]}" do - commentPatches $script "CVE-2018-11412/4.14" "CVE-2020-0067/4.14" "CVE-2022-1204/4.14" "CVE-2023-0461/4.14" "CVE-2023-31084" "CVE-2023-4623/^6.5"; #handle 4.14 + commentPatches $script "CVE-2018-11412/4.14" "CVE-2020-0067/4.14" "CVE-2022-1204/4.14" "CVE-2023-0461/4.14" "CVE-2023-31084" "CVE-2023-4623/^6.5" "CVE-2024-0775/4.14"; #handle 4.14 done echo -e "\e[0;32m[SCRIPT COMPLETE] Fixed CVE patchers\e[0m"; diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 5bbebc21..bbc249c6 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -136,7 +136,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh index b81545ec..36e963e2 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -137,7 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh index 7ab764c7..b7b30479 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh @@ -25,6 +25,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3108/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/5.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0160/5.4/0004.patch @@ -35,22 +36,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3777/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4133/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6040/5.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6606/5.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6915/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-25775/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35826/^6.3/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-45863/5.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-46838/5.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51780/5.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/5.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0646/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/^6.7/0001.patch -editKernelLocalversion "-dos.p50" +editKernelLocalversion "-dos.p41" else echo "kernel_oneplus_sm8350 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh index bd97e8cb..cc77652b 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -137,7 +137,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh index 9273bcf0..ebed6667 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_samsung_exynos9810.sh @@ -621,7 +621,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.9/0008.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh index 16e42673..7209e7e1 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -462,7 +462,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index 8f45e563..380b72d4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -136,7 +136,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 6cbbc09d..051c6175 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -140,7 +140,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-fortify/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.9/0029.patch diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 4e4d5a69..e6257824 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -161,6 +161,7 @@ patchWorkspaceReal() { source build/envsetup.sh; repopick -i 361248; #Launcher3: Allow toggling monochrome icons for all apps + repopick -t T_asb_2024-02; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";