From 411fcc08e172265c2c203a68ce0f7ef9cf50e19f Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 15 Sep 2022 13:20:12 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 5 +++-- .../CVE_Patchers/android_kernel_xiaomi_sdm660.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 5 +++-- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 3 ++- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 3 ++- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 6 ++++-- .../CVE_Patchers/android_kernel_google_redbull.sh | 4 +++- .../CVE_Patchers/android_kernel_google_wahoo.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 +++-- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_sony_sdm660.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 5 +++-- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 3 ++- Scripts/WebView_Update_Repo.sh | 2 +- 21 files changed, 47 insertions(+), 26 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 4e5ff870..580e2ae0 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 4e5ff870bcf4108bb3aac057516b1739585e5ef0 +Subproject commit 580e2ae053a18560dab4775e0818994b97773269 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 8c36d805..61f675b0 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 @@ -511,6 +511,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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 @@ -518,5 +519,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.p518" +editKernelLocalversion "-dos.p519" 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 b2a0b61a..795f2ad8 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 @@ -148,7 +148,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch @@ -303,6 +303,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch 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/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p304" +editKernelLocalversion "-dos.p305" 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 f96880e4..23d70f4a 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 @@ -76,6 +76,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch 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 @@ -101,5 +102,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p101" +editKernelLocalversion "-dos.p102" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index 16eb78e0..a1c36eca 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -240,7 +240,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch @@ -397,9 +397,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch 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/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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.p401" +editKernelLocalversion "-dos.p402" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index ef037911..4fe80d00 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -453,6 +453,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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 @@ -460,5 +461,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.p460" +editKernelLocalversion "-dos.p461" cd "$DOS_BUILD_BASE" 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 4bf25135..f48dbe05 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 @@ -126,6 +126,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/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 @@ -146,5 +147,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p146" +editKernelLocalversion "-dos.p147" 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 a44c2b9b..74b860a6 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 @@ -303,8 +303,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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.p306" +editKernelLocalversion "-dos.p307" 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 bc6756b0..dde713a2 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 @@ -78,6 +78,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch 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-23037/4.9/0003.patch @@ -99,5 +100,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p99" +editKernelLocalversion "-dos.p100" 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 7bee040c..f38e6ff8 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 @@ -67,7 +67,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch @@ -121,6 +121,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2977/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch 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 @@ -148,5 +149,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch 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/^5.19/0001.patch -editKernelLocalversion "-dos.p148" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch +editKernelLocalversion "-dos.p150" 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 e025eb3b..dac64eec 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 @@ -118,6 +118,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2977/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.19/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-20382/ANY/0001.patch @@ -153,5 +154,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p153" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.19/0003.patch +editKernelLocalversion "-dos.p155" 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 b46fa73e..b74ca52d 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 @@ -100,6 +100,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch 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 @@ -125,5 +126,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p125" +editKernelLocalversion "-dos.p126" 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 c35072df..e831377a 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 @@ -79,6 +79,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch 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-23037/4.9/0003.patch @@ -101,5 +102,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p101" +editKernelLocalversion "-dos.p102" 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 535ab78e..1b09023b 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 @@ -204,7 +204,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.14/0002.patch @@ -360,9 +360,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch 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/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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.p364" +editKernelLocalversion "-dos.p365" 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 4634717e..e0465eee 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 @@ -338,9 +338,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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.p342" +editKernelLocalversion "-dos.p343" 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 589a9de3..e4c237e3 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 @@ -68,5 +68,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p68" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/5.4/0006.patch +editKernelLocalversion "-dos.p69" 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 883bb046..177ff563 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 @@ -77,6 +77,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch 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 @@ -102,5 +103,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p103" 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 8f3922ff..ee138965 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 @@ -81,6 +81,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3202/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch 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 @@ -106,5 +107,5 @@ 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/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch -editKernelLocalversion "-dos.p106" +editKernelLocalversion "-dos.p107" 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 16eb78e0..a1c36eca 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 @@ -240,7 +240,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch @@ -397,9 +397,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.14/0002.patch 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/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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.p401" +editKernelLocalversion "-dos.p402" 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 ef037911..4fe80d00 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 @@ -453,6 +453,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36879/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36946/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39188/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-39842/^5.19/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/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 @@ -460,5 +461,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.p460" +editKernelLocalversion "-dos.p461" cd "$DOS_BUILD_BASE" diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index c4cbec0a..4688da62 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,7 +16,7 @@ umask 0022; set -uo pipefail; -export version="105.0.5195.124-1"; +export version="105.0.5195.136-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";