From 7ac51e9116c75e3a32bcc95c51461b8c1bfb1fb2 Mon Sep 17 00:00:00 2001 From: Tavi Date: Fri, 18 Oct 2024 10:27:45 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tavi --- Logs/resetWorkspace-LineageOS-18.1.txt | 2 +- Logs/resetWorkspace-LineageOS-19.1.txt | 2 +- Logs/resetWorkspace-LineageOS-20.0.txt | 48 +++++++++---------- Patches/Linux | 2 +- PrebuiltApps | 2 +- .../android_kernel_xiaomi_sm6150.sh | 1 + .../android_kernel_xiaomi_sm8150.sh | 1 + .../android_kernel_fairphone_sm7225.sh | 2 +- .../android_kernel_fxtec_sm6115.sh | 2 +- ...d_kernel_google_gs101_private_gs-google.sh | 24 ++++++---- ...d_kernel_google_gs201_private_gs-google.sh | 24 ++++++---- .../android_kernel_google_msm-4.14.sh | 1 + .../android_kernel_google_redbull.sh | 2 +- .../android_kernel_oneplus_sm7250.sh | 2 +- .../android_kernel_oneplus_sm8150.sh | 1 + .../android_kernel_oneplus_sm8250.sh | 2 +- .../android_kernel_oneplus_sm8350.sh | 2 +- .../android_kernel_xiaomi_sm6150.sh | 1 + .../android_kernel_xiaomi_sm8250.sh | 2 +- .../android_kernel_xiaomi_vayu.sh | 1 + 20 files changed, 71 insertions(+), 53 deletions(-) diff --git a/Logs/resetWorkspace-LineageOS-18.1.txt b/Logs/resetWorkspace-LineageOS-18.1.txt index acfa6c4a..0c357884 100644 --- a/Logs/resetWorkspace-LineageOS-18.1.txt +++ b/Logs/resetWorkspace-LineageOS-18.1.txt @@ -135,7 +135,7 @@ external/cblas d82c5f4ae14b2a5468303985070f7dadc15d4094 external/cbor-java f81e576298790c97498311e99a0b0b34653c3dd8 external/chromium-libpac 169c93e00a00605346a68d39d3f4713735bdb61e external/chromium-trace e524766cad26d677a9a1ec8c00c512d4cac2cf5e -external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150 +external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983 external/clang 0a1c53a5d295109bd4702ad13c0f2a5510ca1b26 external/cldr 38850463abd624d5b2293be75fddc43cf6b55ae2 external/cn-cbor 696530332036f5518681d3c450cdbc3ee412004a diff --git a/Logs/resetWorkspace-LineageOS-19.1.txt b/Logs/resetWorkspace-LineageOS-19.1.txt index 6a85b3bd..28f602a4 100644 --- a/Logs/resetWorkspace-LineageOS-19.1.txt +++ b/Logs/resetWorkspace-LineageOS-19.1.txt @@ -94,7 +94,7 @@ external/catch2 2b2e0e9540defee10f28ea0fc97750490fa238b5 external/cblas 2b24922070cb6d45edd5f5b533db0637099a2b17 external/cbor-java 00c4a382dd3810f9c1b363eaad339cff34a3f6fe external/chromium-trace 138ade68f9d3388a1b0a6d9ce5e091ff6f7e7448 -external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150 +external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983 external/clang f1cef8e77ae220c9379303bdc9896e0c2366bd6f external/cldr 242ecd0dcb21f3376f825119ec0b36fcb15e7bb8 external/cn-cbor 6a0f6a5375b8cd9b495e91c11d21ed257ec9a905 diff --git a/Logs/resetWorkspace-LineageOS-20.0.txt b/Logs/resetWorkspace-LineageOS-20.0.txt index b277caf9..de8d3bf6 100644 --- a/Logs/resetWorkspace-LineageOS-20.0.txt +++ b/Logs/resetWorkspace-LineageOS-20.0.txt @@ -201,7 +201,7 @@ external/catch2 5f8628024c5a9219caa004d6a9547aacd9ba94c1 external/cblas 4fdeda64177f60e1b226349885b3c0ea016f3068 external/cbor-java 6b4b6adc5ff8f91e2ddef14adf510e14aaf90204 external/chromium-trace 9456b95a6d4b95c765c9f2264a71b0334f6cf8d7 -external/chromium-webview ecd8b05d520fcdbc23530879bcda9ca8af7bf150 +external/chromium-webview 78ac5933cd068e59e1758c70e705ce83a326d983 external/clang 9fae335badf26813486d207b69928d38b979e522 external/cldr 7518f37169bd87d6977244e4d7471bc48fcd62e0 external/cn-cbor 7b581886d1830f50c3ab104a56b7ab931779466f @@ -802,7 +802,7 @@ external/zstd e6a035a8df42f375160f2acabe3caa283a0184d7 external/zucchini 11a3a4cd409d6e0f4ccfcfb97cc962eeaeddde00 external/zxing 248d7c742809ce1cbde1c4e6163d347e1feb274b frameworks/av 17fdb80d01ef17849c4d4e1100d05d29977117b2 -frameworks/base e29f06c199f207039b44ba013bc390721e99b0d5 +frameworks/base 372c4384dd8b995cc06a4459d3dfa70ac9603565 frameworks/compile/libbcc 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5 frameworks/compile/mclinker 18374a53dc8e00ec3667b4e1a257c9b4e41f007f frameworks/compile/slang 1738348ca3d011f3f340883bd48e03a8e6aeb143 @@ -853,7 +853,7 @@ hardware/google/pixel-sepolicy eec446aa4fb152d6651c90de682cf73f8e202bd4 hardware/interfaces 2f83e1bda9536aaf406352c868a8192cc3526a69 hardware/invensense 004a2dd5ea0d3a777520319536de119be1ba0049 hardware/knowles/athletico/sound_trigger_hal 61ca38058a06c524677654d67d6f4bed7757f1d7 -hardware/lge 8393294a9e798bfe60f13b6c87b749291fc1a997 +hardware/lge 56d44ca3fbb66e8a103379b9ebc684545ea649c4 hardware/libhardware 0eb202d7ebd7d2410eb2f62c908c0341964a4829 hardware/libhardware_legacy 50d9f52f7a7d4c70f10d6a9dca9a1f83a16c85ca hardware/lineage/compat 015d90baa57a65c5bdeed20997dfdede50e65ca7 @@ -861,8 +861,8 @@ hardware/lineage/interfaces 56bf43755bdc4045ec56b4c02eaaaf9894f91003 hardware/lineage/livedisplay 3e298771b18d6c0e28350f50c7204c3c036662b8 hardware/nxp/nfc ea29b939898b9b7aa998124d3bbc9e7322c01514 hardware/nxp/secure_element 69b223b099f01b59100a175cc6b1ce11c76d203a -hardware/oneplus f4b6451ae857e6dbb7d0aab19adeb302d201eb31 -hardware/oplus 88598d59aac8b83420958f8296756377f39a0703 +hardware/oneplus bb649485ef11e1282330d95c80a552d3fc211017 +hardware/oplus 4e391895139eaac2532f8b90e08d0385733bdc1b hardware/qcom-caf/bootctrl e4868c89bd6433a5d14df4b33f66b2003bddb7ad hardware/qcom-caf/bt b7218e4c89817079546f035f3cfe5f99b4730d43 hardware/qcom-caf/common b7371b2235ec060d226a56729cf29db0e54423a2 @@ -1029,13 +1029,13 @@ kernel/xiaomi/vayu 6c9febddfbd505b760d12f585288cf7612ad57d8 kernel/zuk/msm8996 cc57cb4ee3b7918b74d30604735d353b9a5fa23b libcore 2a7d66adbcde1862f9295ae0a13f1751b193e4d7 libnativehelper 49ecc5f1e97e810d27e2c6558abdde49e875349b -lineage-sdk 3c88fb4dc96aaa8254cc39aabc518573bd845b76 +lineage-sdk 0b740679650b887691ac72462705913b7017ec26 lineage/scripts 888f78428b586276ee08d9aa3122174a8792c767 -packages/apps/Aperture d0ded54aed642dc751d293e93c4ef7d96177f996 +packages/apps/Aperture 1f91156b065e90d067136f5c2f8a635069605024 packages/apps/AudioFX 15e2a666d21551698ea0744996abcdc35e6c0cc1 -packages/apps/Backgrounds 79f8b864a97ab942dfb4c869ed20ed00462a9974 +packages/apps/Backgrounds 8600246ca64332e9cac3993c172ceef80cf3cc74 packages/apps/BasicSmsReceiver ae8e590ae7856e3007fe2b78489894a5fbf3f36a -packages/apps/Camera2 e290e9ea0161e4ad162a9f17f376178e7fa36521 +packages/apps/Camera2 0285e006e481e1fa263dbee3f18389dfeefe5fac packages/apps/Car/Calendar 74a8375041155969dca0cf89725e30b28d905473 packages/apps/Car/Cluster be7bbdb8f1568a93caaca2d7c1292d4b12a380f1 packages/apps/Car/DebuggingRestrictionController b1483fd34c896ab040f1abd43c99f0c4741223a5 @@ -1060,10 +1060,10 @@ packages/apps/CarrierConfig 6e3308a1bdcf61444ab2bb4ea886be705099da99 packages/apps/CarrierConfig2 e710a67ed64620fc11f62520cceef4bba64dc2a6 packages/apps/CellBroadcastReceiver 3d7340eeac82125cd9091fc368a031e98f4db7fd packages/apps/CertInstaller 98a80cd7f6f9ad8b46acb5c4798fd2d9253d37c4 -packages/apps/Contacts 511d7675a5e9b58a7af738e50e8e108ccc0d2b6f -packages/apps/DeskClock e71b8d974545c53ee716b930c5b26485932c63b5 -packages/apps/Dialer d71f3815cc49f86671858dc7cf57e02c05ac5b8f -packages/apps/DocumentsUI e8bc0248fe5672cc4242b0e4c4196a28233d77ec +packages/apps/Contacts ff2da07f69fa3691f748418ac8fed11498cd4aec +packages/apps/DeskClock 8002d9cd376f1bee8819e1de08378a68f8ba9e0f +packages/apps/Dialer 63c20132d3b3c6bf1ae1f92b0877942a4fe290ce +packages/apps/DocumentsUI 7c092fdb040962c965c2f40a11389e4477d0177b packages/apps/ElmyraService f1f42c57441fad817d5da7e04ecb742d389119c5 packages/apps/EmergencyInfo e8fe444bd8f8d9b807ed9da969d4147896af6142 packages/apps/Etar 9c886e5728c4bbba4d3d9cd43ba181970b10239b @@ -1075,9 +1075,9 @@ packages/apps/HTMLViewer 40ee5730f96f840b1be7cbe8daabddd543eba49b packages/apps/ImsServiceEntitlement 79a64a6e1d2602e81977a628ae385002bddd9e89 packages/apps/KeyChain d90f056762b0390f0c1a9823af51894f14a9f746 packages/apps/LineageCustomizer 6d78f750ddfe8b7b5821a9ce83860755491b8bd8 -packages/apps/LineageParts c0a5086aed1764080d63f59ece53a5e64fa6df22 +packages/apps/LineageParts e557a019ed4933f9b1843ce996d9a4c597528abd packages/apps/ManagedProvisioning 4986c737e21b57a0545a4ba4f63be02e26f09243 -packages/apps/Messaging f3d40fe9a4cb85d1a425301e69c6ffbd44dc2f31 +packages/apps/Messaging f8315f1d168df06d65ebdcf276d9c18e285ed795 packages/apps/Nfc c28555164b8d2c8e12d7d4439f1ce9d83b9655ab packages/apps/OnDeviceAppPrediction 460e94bc49773d6e1a442fe0885e64bf3de98992 packages/apps/OneTimeInitializer 3f70a0dbc890d9f125c4090b4ccfd5157ad87a64 @@ -1085,14 +1085,14 @@ packages/apps/PhoneCommon f44c97cc5c6de1c980694af76d1692157dd50a0c packages/apps/Profiles 9494c0176f0c36a342d73f4e5e8c27a10c4f3919 packages/apps/Provision 841d5199e1d1c64e7853fd953eed5247780908c1 packages/apps/QuickAccessWallet ad935df93a556861473b3b411e255b4165d67fc0 -packages/apps/Recorder 0678d3fbc32d9a0398da17d5a0d62105f6721a7a +packages/apps/Recorder 031796ff29de62cc3a2faf6e53fa5295e4d24b51 packages/apps/RemoteProvisioner 06d16c8031ce54bff1a07cc64f8b02140a3753c1 packages/apps/SafetyRegulatoryInfo f5dfd6ab7ea6aaa1a0014106110733e316379e95 packages/apps/SecureElement 7e9d165899058103fa612ffb41858e4fd975182b packages/apps/Seedvault e03ad756817631611b7497d9fe7b2173e2756b9d -packages/apps/Settings 0a53e16e7b7dad0ff4bcda18f3bcd38b7d4b5a12 +packages/apps/Settings 6eeb7082ba8fad775706a58711c0de881e284163 packages/apps/SettingsIntelligence 4ef92f41721f25bbdec5c0b2433547ef323e72ac -packages/apps/SetupWizard 64d9f5984dc03d39825b7d01dabff42f55dde79e +packages/apps/SetupWizard 86046a3a2e3f0c127c45132ede75c9f10a1377af packages/apps/SimpleDeviceConfig 82d31b18dd2550e05f89248f128cb571eecc863a packages/apps/SimpleSettingsConfig f5620aa22a44ac3a9794d0fda5c146efd7e0a11e packages/apps/Stk 9cbb287404fb15a3a13c63f15b73962cdd18529d @@ -1101,17 +1101,17 @@ packages/apps/SystemUIGo 5431a35c7bc359a226440d24f89ce13801266af4 packages/apps/TV b1a0cfb28cb809da961f520058ba8f93d2649975 packages/apps/Tag 2e6b762fba6b10af7c003f801c1f6fd8f1962038 packages/apps/Test/connectivity 6179ceeccf2ed30919d9e913f8a43ee81d01d41c -packages/apps/ThemePicker f9a905d6fdd564a79d091f23f8b3f0cbf2b6f353 +packages/apps/ThemePicker b55b970ea09cfa0266e469b5026d48b6f998dcac packages/apps/TimeZoneData 498c5148458a63598417d2b2369fbed3ab19331c packages/apps/TimeZoneUpdater e862d8ef6370b8540a8dd010d9c8dcff20735af5 packages/apps/Traceur f1f531bd3dd414aa6b8d81d517b3c6c9164a657b -packages/apps/Trebuchet 78926471f0965a923e33e196f2aaa4034f1179df +packages/apps/Trebuchet b3ad30740644828c9e2b4cc6901ee9d459cb003a packages/apps/TvSettings 82d09fbb7635d4eaf4496925768697f272614abc packages/apps/UniversalMediaPlayer a56170cac624f5cd5b5344de8a24b074049d9076 -packages/apps/Updater ed1368ebb0c5faeb07bc8ce9597839a694f22399 +packages/apps/Updater e046bb8794752cc0f0dff2fbd9c3d47eb5a01c08 packages/apps/WallpaperPicker 5b6254f657aa278f874b819f8de2edeb59acf85c packages/apps/WallpaperPicker2 87e1441dc8743a3518d92f941e6f784c9eedc5c1 -packages/inputmethods/LatinIME eb7b5ae969456be4685b6024707e8360df4e5ee9 +packages/inputmethods/LatinIME e7072a89778c3c0cba892949d9e90e72728ee6bc packages/inputmethods/LeanbackIME 945d4dc0f957bd3538a286b41babd93002d93d5c packages/modules/AdServices cf7fdc79568f5adb4028e9339bea92429d109cb7 packages/modules/AppSearch 5afd5a663c198a6b83ce8b4c49ae40903afae022 @@ -1159,7 +1159,7 @@ packages/providers/PartnerBookmarksProvider d982e500f09447d000f2ca67782831cc6b59 packages/providers/TelephonyProvider 64aa1787b56d1e9b03bcd18dc652aa7a395c4db0 packages/providers/TvProvider c0e54c118bc93bce2f3edaa5fa9c59089c896dc8 packages/providers/UserDictionaryProvider 1a5d6d4997847e0ec2040be5cb9a7efaf1620e72 -packages/resources/devicesettings 6af1f0af1b3e2b8a5b8aec1886289c909533ef75 +packages/resources/devicesettings ed9f07d4ae037417df213da01a7b76b6231c44a5 packages/screensavers/Basic d3aaa026dc3eaf7a249c1a00c1a0524e9c1bb349 packages/screensavers/PhotoTable d5a731373f32b698776402bae8ff09a9676b6bb1 packages/services/AlternativeNetworkAccess dc09bf9c4b5652ef0096e4991f565854160395af @@ -1337,7 +1337,7 @@ tools/tradefederation/prebuilts dcb8956ae70359e7f554b9eb50e185d2a7feb6cd tools/treble d74b74010472ba957f4125b676a41c23ca91e549 tools/trebuchet 9ff3c1fd3ea48b7c148fc1f6e2456dbc5596ca8d vendor/codeaurora/telephony ebdb27e3a6d9f94aed27dee2819829a3d656ad20 -vendor/crowdin 20d2d8e5fc7d4c51966b2adb303e8fe96f2d19c7 +vendor/crowdin d885a80467099b4ace6becc0f16a4923270f9062 vendor/essential/mata 3e37777606e559f33c9e1d247b15de1fac359fe5 vendor/fairphone/FP3 6ebc77ace3dce27e03973ddb4bb9629de576cdd7 vendor/fairphone/FP4 6482b251c7c1620cbc85d513cfd12fce70ff6eb6 diff --git a/Patches/Linux b/Patches/Linux index 63e4df0b..de5c4408 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 63e4df0bbb2b0eb66e89c8052700316c15e66e18 +Subproject commit de5c44087270023dc15431b9a8ba124713c4af5c diff --git a/PrebuiltApps b/PrebuiltApps index 7f36b2f3..77eb4d2c 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 7f36b2f3dc9845fb1ef2206c271adf5792f18d13 +Subproject commit 77eb4d2c11397b255977f66242090478f09e2e1a diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index 5689f552..cca51003 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -212,6 +212,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30299/audio-kernel/0001.patch --direc git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30319/qcacld-3.0/0001.patch --directory=drivers/staging/qcacld-3.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index 8be76328..55de94b9 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -309,6 +309,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30319/qcacld-3.0/0001.patch --directo git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30334/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh index 81c767fc..b8892199 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fairphone_sm7225.sh @@ -526,7 +526,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p527" +editKernelLocalversion "-dos.p526" else echo "kernel_fairphone_sm7225 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh index c6ebcacd..c82ba8b5 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_sm6115.sh @@ -526,7 +526,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p527" +editKernelLocalversion "-dos.p526" else echo "kernel_fxtec_sm6115 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh index a464e2bc..818dcf2a 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh @@ -74,7 +74,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4129/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4379/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/5.10/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36402/5.10/0002.patch @@ -548,6 +548,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26900/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26901/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26907/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26920/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26921/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26926/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26931/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26934/5.10/0003.patch @@ -593,7 +594,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27047/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27051/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27052/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27072/^6.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27072/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27073/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/5.10/0003.patch @@ -677,6 +678,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35955/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35958/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35960/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35962/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35965/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35966/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35967/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35969/5.10/0004.patch @@ -732,6 +734,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37078/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37353/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37356/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38381/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38544/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38546/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38547/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38548/5.10/0002.patch @@ -833,7 +836,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41020/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41022/5.10/0002.patch @@ -954,6 +957,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43905/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43907/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43908/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43914/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44931/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44938/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44939/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44944/5.1-^6.10/0001.patch @@ -990,6 +994,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46679/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46684/^6.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46685/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46689/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46695/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46702/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46713/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46714/5.10/0002.patch @@ -1039,16 +1044,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46830/^6.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46832/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46840/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46844/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46849/^6.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46853/^6.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46854/^6.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46849/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46853/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46854/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47659/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47663/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47667/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47668/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47669/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47670/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47671/^6.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47670/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47671/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47672/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-selinux-rwx/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/5.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47490/5.10/0002.patch @@ -1060,7 +1066,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch -editKernelLocalversion "-dos.p1060" +editKernelLocalversion "-dos.p1066" else echo "kernel_google_gs101_private_gs-google is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh index dc8d4aef..427c37a8 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh @@ -74,7 +74,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4129/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4379/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/5.10/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/^5.15/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36402/5.10/0002.patch @@ -546,6 +546,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26900/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26901/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26907/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26920/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26921/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26926/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26931/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26934/5.10/0003.patch @@ -591,7 +592,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27047/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27051/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27052/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27072/^6.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27072/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27073/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/5.10/0003.patch @@ -675,6 +676,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35955/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35958/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35960/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35962/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35965/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35966/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35967/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35969/5.10/0004.patch @@ -730,6 +732,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37078/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37353/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-37356/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38381/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38544/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38546/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38547/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38548/5.10/0002.patch @@ -831,7 +834,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41012/5.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41014/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41020/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41022/5.10/0002.patch @@ -952,6 +955,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43905/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43907/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43908/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43914/5.10/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44931/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44938/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44939/^6.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-44944/5.1-^6.10/0001.patch @@ -988,6 +992,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46679/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46684/^6.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46685/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46689/5.10/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46695/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46702/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46713/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46714/5.10/0002.patch @@ -1037,16 +1042,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46830/^6.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46832/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46840/5.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46844/5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46849/^6.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46853/^6.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46854/^6.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46849/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46853/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-46854/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47659/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47663/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47667/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47668/5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47669/5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47670/^6.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47671/^6.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47670/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47671/5.10/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47672/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-selinux-rwx/5.10/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/5.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47490/5.10/0002.patch @@ -1058,7 +1064,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch -editKernelLocalversion "-dos.p1058" +editKernelLocalversion "-dos.p1064" else echo "kernel_google_gs201_private_gs-google is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh index 72bc248e..f759fb37 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -68,6 +68,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0006.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh index dfeefa3e..5d560f28 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_redbull.sh @@ -753,7 +753,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p754" +editKernelLocalversion "-dos.p753" else echo "kernel_google_redbull is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh index d739ab54..2a0725a2 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -582,7 +582,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p583" +editKernelLocalversion "-dos.p582" else echo "kernel_oneplus_sm7250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index ea27c93c..4176f14c 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -283,6 +283,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30299/audio-kernel/0001.patch --direc git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh index 159df899..ac30e9d1 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -527,7 +527,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p528" +editKernelLocalversion "-dos.p527" else echo "kernel_oneplus_sm8250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" 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 0e816116..c9925b16 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 @@ -650,7 +650,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.4/0005.patch -editKernelLocalversion "-dos.p651" +editKernelLocalversion "-dos.p650" 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_xiaomi_sm6150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index c59f01b5..195cccf4 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -69,6 +69,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0006.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index f1f4c5a3..ff7a95d7 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -408,7 +408,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-47670/^6.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-26720/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch -editKernelLocalversion "-dos.p409" +editKernelLocalversion "-dos.p408" else echo "kernel_xiaomi_sm8250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh index 5da68371..1a5f0e56 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh @@ -67,6 +67,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3506/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33624/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/4.19/0006.patch