From 2166491d5d11fdbf16faac24500c3e1e51e35897 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 12 Oct 2022 16:33:39 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 9 +++++---- .../CVE_Patchers/android_kernel_samsung_universal9810.sh | 5 +++-- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 9 +++++---- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 5 +++-- .../CVE_Patchers/android_kernel_google_marlin.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 5 +++-- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 5 +++-- Scripts/LineageOS-18.1/Functions.sh | 3 +-- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 9 +++++---- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 5 +++-- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 7 ++++--- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 7 ++++--- .../CVE_Patchers/android_kernel_google_wahoo.sh | 5 +++-- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 5 +++-- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 5 +++-- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 7 ++++--- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 9 +++++---- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 7 ++++--- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 5 +++-- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 5 +++-- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 5 +++-- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 9 +++++---- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 9 +++++---- Scripts/LineageOS-19.1/Functions.sh | 1 - 30 files changed, 93 insertions(+), 68 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 883868f5..ee954fc5 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 883868f54b4e362673b46bada596a811a9453941 +Subproject commit ee954fc5aa09af76293d81cbe1c4a8776c1db2d5 diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 09fe6bc3..6b0b5aeb 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -488,9 +488,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch @@ -520,6 +520,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch @@ -527,5 +528,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p527" +editKernelLocalversion "-dos.p528" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index c4efefd7..9eaecf05 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -356,7 +356,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch @@ -377,9 +377,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch -editKernelLocalversion "-dos.p381" +editKernelLocalversion "-dos.p382" cd "$DOS_BUILD_BASE" 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 a94b9268..9e9d9b6f 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 @@ -281,9 +281,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch @@ -309,6 +309,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p310" +editKernelLocalversion "-dos.p311" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index fad17266..6ad53a44 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -354,7 +354,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.4/0015.patch @@ -375,9 +375,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p379" +editKernelLocalversion "-dos.p380" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh index c79bc375..e69b7bb5 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -481,6 +481,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36123/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch @@ -489,5 +490,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p489" +editKernelLocalversion "-dos.p490" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh index 55c77791..12f561ef 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh @@ -83,7 +83,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -107,5 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p107" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p108" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index fbdb8613..bf0b995a 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -344,7 +344,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22064/qcacld-2.0/0003.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22065/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch @@ -370,10 +370,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p375" +editKernelLocalversion "-dos.p376" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index b0ad00f7..0b530d6f 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -110,12 +110,11 @@ patchWorkspace() { gpgVerifyGitTag "$DOS_BUILD_BASE/external/hardened_malloc"; gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it eleven-firewall; #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default #repopick -i 339287; #Settings: Good news, `encryptable=footer` is broken - repopick -it R_tzdb2022a2; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 6af277b6..69168cb2 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -149,5 +149,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p149" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p150" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 7b45811a..b96b60a8 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -75,5 +75,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p75" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p76" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh index e3e5e465..b73a4a96 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fairphone_sm7225.sh @@ -280,9 +280,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch @@ -311,8 +311,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p314" +editKernelLocalversion "-dos.p315" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index f62c1212..809f57b4 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -84,7 +84,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -105,5 +105,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p105" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p106" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh index 9853c411..65c126c5 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.14.sh @@ -128,8 +128,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/^5.17/0001.patch @@ -155,5 +155,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch -editKernelLocalversion "-dos.p155" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch +editKernelLocalversion "-dos.p156" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index fa98241f..e3af99dd 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0328-0329.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -74,5 +75,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p74" +editKernelLocalversion "-dos.p75" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh index f8ad7c3d..bff7a4f5 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -125,8 +125,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23036/4.19/0004.patch @@ -162,5 +162,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch -editKernelLocalversion "-dos.p162" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch +editKernelLocalversion "-dos.p163" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh index 4fc1687a..4cc67162 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -107,7 +107,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -131,5 +131,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p131" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p132" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 2ddafea6..94179c48 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -85,7 +85,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -107,5 +107,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p107" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p108" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index e6cc8901..7354cac1 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -321,7 +321,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch @@ -342,7 +342,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch -editKernelLocalversion "-dos.p344" +editKernelLocalversion "-dos.p345" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 0cdc4d04..9b38b69a 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -346,8 +346,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch @@ -371,8 +371,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch -editKernelLocalversion "-dos.p374" +editKernelLocalversion "-dos.p375" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh index d844013d..6ad61f4b 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -312,9 +312,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.19/0002.patch @@ -347,9 +347,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0001.patch -editKernelLocalversion "-dos.p351" +editKernelLocalversion "-dos.p352" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh index 0884a57e..f48fd7a9 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8350.sh @@ -55,8 +55,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3303/5.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/5.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-21505/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -73,5 +73,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41222/5.4/0003.patch -editKernelLocalversion "-dos.p73" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.4/0007.patch +editKernelLocalversion "-dos.p74" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 1a4e357e..93de9154 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -84,7 +84,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -108,5 +108,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p108" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p109" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh index f4dc5ba1..79795990 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -91,5 +91,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p91" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p92" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh index 7e1a8165..91a29e54 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -88,7 +88,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23037/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23040/4.9/0003.patch @@ -112,5 +112,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p112" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch +editKernelLocalversion "-dos.p113" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm845.sh index 26e982e0..8cef5702 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -325,7 +325,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch @@ -346,7 +346,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.9/0007.patch -editKernelLocalversion "-dos.p348" +editKernelLocalversion "-dos.p349" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 7aa9a653..4aa65694 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0328-0329.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch @@ -69,5 +70,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.9/0004.patch -editKernelLocalversion "-dos.p69" +editKernelLocalversion "-dos.p70" cd "$DOS_BUILD_BASE" 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 dc12a2e1..d4280cc3 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 @@ -376,9 +376,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0003.patch @@ -403,9 +403,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p407" +editKernelLocalversion "-dos.p408" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index f7037aab..05354735 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -430,9 +430,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23041/4.19/0004.patch @@ -462,6 +462,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch @@ -469,5 +470,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-22095/ANY/0001.patch -editKernelLocalversion "-dos.p469" +editKernelLocalversion "-dos.p470" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 0221a349..2c3db1e8 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -115,7 +115,6 @@ patchWorkspace() { gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; #source build/envsetup.sh; - #repopick -it S_tzdb2022a2; #needs picks sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";