From b81d39c969e08928d7b1b25134ac52fc707c44a1 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 11 Nov 2022 14:53:06 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../android_kernel_samsung_universal8890.sh | 2 +- .../CVE_Patchers/android_kernel_google_dragon.sh | 2 +- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_zte_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_msm8937.sh | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 2 +- .../android_kernel_samsung_universal9810.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 2 +- .../CVE_Patchers/android_kernel_yandex_sdm660.sh | 2 +- Scripts/LineageOS-17.1/Functions.sh | 1 + .../CVE_Patchers/android_kernel_google_marlin.sh | 2 +- .../CVE_Patchers/android_kernel_lge_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8996.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_zuk_msm8996.sh | 2 +- Scripts/LineageOS-18.1/Functions.sh | 1 + .../CVE_Patchers/android_kernel_essential_msm8998.sh | 5 +++-- .../CVE_Patchers/android_kernel_fairphone_sdm632.sh | 2 +- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 2 +- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 2 +- .../CVE_Patchers/android_kernel_google_redbull.sh | 2 +- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 6 ++++-- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 2 +- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 2 +- Scripts/LineageOS-19.1/Functions.sh | 1 + .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 2 +- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 5 ++--- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 2 +- .../CVE_Patchers/android_kernel_google_redbull.sh | 2 +- .../CVE_Patchers/android_kernel_google_wahoo.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 6 ++++-- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 12 ++---------- Scripts/LineageOS-20.0/Functions.sh | 1 + 53 files changed, 63 insertions(+), 63 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index b8dc4763..87a15eae 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit b8dc476337c76e7d60c48667ff7e07e2f26f1bf7 +Subproject commit 87a15eaebffbd24345e80e46636e62835c0b158f diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index 9f7275e3..86d35b95 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -728,7 +728,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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/0004-net-add-recursion-limit-to-GRO.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index 564ee4ff..445131c2 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -686,7 +686,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.18/0003-alt.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index e985f450..4a46bdb3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -581,7 +581,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 6a47ca67..6b9a6e10 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -672,7 +672,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0004.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index 6f7d9b2b..2aa4f4da 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -445,7 +445,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 8b284ad9..31f4b056 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -591,7 +591,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 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 a58081d0..804e9753 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 @@ -535,7 +535,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 46ba480e..be34c774 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 @@ -389,7 +389,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 ced950dd..abfce6d9 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 @@ -324,7 +324,7 @@ 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-40768/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch editKernelLocalversion "-dos.p327" 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 83ed27c2..6d49fdff 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 @@ -383,7 +383,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index bcb70fa0..5d689291 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -84,6 +84,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it ten-firewall; repopick -it Q_asb_2022-11; + repopick -it Q_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; 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 dd428151..346287df 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 @@ -489,7 +489,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 61752f2e..fb3937b9 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -569,7 +569,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index e7e80290..f85c33f4 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -490,7 +490,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch 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 9dc565e8..7a537579 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 @@ -118,7 +118,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch editKernelLocalversion "-dos.p121" 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 1ad6c5ad..75d0d6ad 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 @@ -379,7 +379,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index b532a93c..c66ad0e7 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -115,6 +115,7 @@ patchWorkspace() { #repopick -i 314453; #TaskViewTouchController: Null check current animation on drag #repopick -i 325011; #lineage: Opt-in to shipping full recovery image by default repopick -it R_asb_2022-11; + repopick -it R_tzdb2022f; 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 bb88af6c..82255918 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 @@ -141,6 +141,7 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.9/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25724/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25743/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26490/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch @@ -159,7 +160,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p162" 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 0d6018e0..4dd680bf 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 @@ -78,7 +78,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p80" 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 87263fd1..b767ec17 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 @@ -327,7 +327,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 ccf85bfe..5fa4e6cf 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 @@ -116,7 +116,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p118" 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 77466a5d..954c67ee 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 @@ -171,7 +171,7 @@ 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-40768/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.14/0002.patch editKernelLocalversion "-dos.p173" 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 4e7da0b1..5253ccd7 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 @@ -84,7 +84,7 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p86" 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 c43a51b2..407fab4a 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 @@ -178,7 +178,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.19/0003.patch editKernelLocalversion "-dos.p180" 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 61258b61..f55be6b0 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 @@ -142,7 +142,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0002.patch 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 b11d19af..86a725cc 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 @@ -117,7 +117,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p119" 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 c6fea92e..fe3c67c1 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 @@ -354,7 +354,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 0d1cc360..97d7b7f4 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 @@ -385,7 +385,7 @@ 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-40768/4.14/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 6abd1415..76baa0e1 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 @@ -363,7 +363,7 @@ 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-40768/4.19/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 5e385c80..c2857065 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 @@ -20,6 +20,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16120/^5.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.4/0009.patch @@ -56,6 +57,7 @@ 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-3521/^6.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3535/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/^5.19/0001.patch @@ -95,10 +97,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41674/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42720/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42721/5.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0004.patch -editKernelLocalversion "-dos.p100" +editKernelLocalversion "-dos.p102" 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 f4d016d2..765c8056 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 @@ -119,7 +119,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0002.patch 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 30661c25..256da4ae 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 @@ -104,7 +104,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p106" 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 0280e9f9..f870a8ed 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 @@ -123,7 +123,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0002.patch 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 73b1fc5b..10da04ca 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 @@ -358,7 +358,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 5ca59751..4248fc53 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 @@ -79,7 +79,7 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p81" 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 329b4409..feab5a43 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 @@ -417,7 +417,7 @@ 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-40768/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 a9d118e0..6d7d2644 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 @@ -477,7 +477,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 4bc584f0..c7b70c7c 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -116,6 +116,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it twelve-colors; repopick -it S_asb_2022-11; + repopick -it S_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; 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 dac6e338..91a5dbd2 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 @@ -324,7 +324,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh index ccf85bfe..5fa4e6cf 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -116,7 +116,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p118" 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 50ae6e47..c31a2f41 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 @@ -106,7 +106,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25724/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/4.14/0002.patch @@ -122,7 +121,7 @@ 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-40768/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.14/0002.patch -editKernelLocalversion "-dos.p124" +editKernelLocalversion "-dos.p123" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh index 672bb0e0..f146b16c 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -81,7 +81,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p83" cd "$DOS_BUILD_BASE" 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 d56d3ebf..3d354dd9 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 @@ -124,7 +124,7 @@ 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-40768/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.19/0003.patch editKernelLocalversion "-dos.p126" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh index 61258b61..f55be6b0 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_wahoo.sh @@ -142,7 +142,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-Misc4/4.4/0002.patch diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh index f937f02d..5d5f861f 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -114,7 +114,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p116" cd "$DOS_BUILD_BASE" 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 c6fea92e..fe3c67c1 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 @@ -354,7 +354,7 @@ 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-40768/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 0d1cc360..97d7b7f4 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 @@ -385,7 +385,7 @@ 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-40768/4.14/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 6abd1415..76baa0e1 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 @@ -363,7 +363,7 @@ 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-40768/4.19/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/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 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 f11a2cbc..c7ceb8e3 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 @@ -19,6 +19,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16120/^5.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3669/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3759/5.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28039/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/5.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33655/^5.19/0002.patch @@ -44,6 +45,7 @@ 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-3521/^6.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3524/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3535/5.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3545/^5.19/0001.patch @@ -81,10 +83,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41674/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42720/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42721/5.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-MiscWireless/^6.0/0004.patch -editKernelLocalversion "-dos.p86" +editKernelLocalversion "-dos.p88" 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 16bd822f..aaed355a 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 @@ -76,7 +76,7 @@ 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-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch editKernelLocalversion "-dos.p78" cd "$DOS_BUILD_BASE" 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 4568bc16..dcc1dd5a 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 @@ -66,17 +66,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2153/^5.17/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3521/^6.0/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3542/3.8-^6.0/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3565/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3594/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3621/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3646/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.9/0004.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-27950/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40768/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/^6.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch -editKernelLocalversion "-dos.p78" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/4.9/0004.patch +editKernelLocalversion "-dos.p70" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 66e02174..0d7ce250 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -105,6 +105,7 @@ patchWorkspace() { #source build/envsetup.sh; #repopick -i 343790; #usb: have enableUsbDataSignal() call queryPortStatus() if successful #repopick -i 343791; #UsbManager: enableUsbDataSignal: return early if HAL version is too old + #repopick -it T_tzdb2022f; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";