From a62922e72d7bca0d9b0f468fa44966809a311bab Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 6 Dec 2022 14:11:01 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_google_dragon.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 4 +++- .../CVE_Patchers/android_kernel_samsung_universal9810.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 5 ++++- .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 4 +++- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 5 ++++- .../CVE_Patchers/android_kernel_google_redbull.sh | 6 +++++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 ++++- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 3 ++- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 5 ++++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 4 +++- Scripts/LineageOS-19.1/Functions.sh | 1 + Scripts/LineageOS-19.1/Patch.sh | 5 +++++ .../CVE_Patchers/android_kernel_fairphone_sm7225.sh | 4 +++- .../CVE_Patchers/android_kernel_google_msm-4.14.sh | 6 +++++- .../CVE_Patchers/android_kernel_google_redbull.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 ++++- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 4 +++- Scripts/LineageOS-20.0/Functions.sh | 3 ++- 25 files changed, 78 insertions(+), 23 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 71a2f79f..1f01b2aa 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 71a2f79f7114efb3e6d34d091ec2dac8ecd820f8 +Subproject commit 1f01b2aaa3910e757fef0257a4c13e2ce3c03f1c 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 c025534b..d0430ed9 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 @@ -675,6 +675,7 @@ 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-3635/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/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-24958/4.4/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.4/0008.patch @@ -705,5 +706,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.p705" +editKernelLocalversion "-dos.p706" cd "$DOS_BUILD_BASE" 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 4362bf33..7c060154 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 @@ -508,6 +508,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -552,5 +554,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.p552" +editKernelLocalversion "-dos.p554" 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 0d771b79..cd39711f 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 @@ -370,6 +370,8 @@ 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/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/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-24448/4.9/0004.patch @@ -402,5 +404,5 @@ 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.p402" +editKernelLocalversion "-dos.p404" 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 a13a2ccd..60af8846 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 @@ -301,6 +301,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch @@ -308,6 +310,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -335,5 +338,5 @@ 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-2022-45934/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p335" +editKernelLocalversion "-dos.p338" 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 2f926cae..e75a67c2 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 @@ -301,6 +301,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -340,5 +342,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p340" +editKernelLocalversion "-dos.p342" 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 0620ae5d..3b80ef31 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 @@ -147,6 +147,8 @@ 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/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -154,6 +156,7 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25724/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -181,5 +184,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.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-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p181" +editKernelLocalversion "-dos.p184" 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 3b7022b9..2234217d 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 @@ -145,6 +145,8 @@ 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/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -157,6 +159,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23042/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0004.patch @@ -187,5 +191,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.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-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p187" +editKernelLocalversion "-dos.p191" 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 d5838dee..b9d3a736 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 @@ -336,6 +336,8 @@ 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/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/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-24448/4.9/0004.patch @@ -366,5 +368,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p366" +editKernelLocalversion "-dos.p368" 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 e97eb7b6..08fc0d16 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 @@ -364,11 +364,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -398,5 +401,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p398" +editKernelLocalversion "-dos.p401" 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 8e74e2b4..13be28e6 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 @@ -333,6 +333,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -377,5 +379,5 @@ 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.p377" +editKernelLocalversion "-dos.p379" 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 87b3d11b..a4dfced3 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 @@ -81,6 +81,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.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-20566/5.4/0008.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 @@ -110,5 +111,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p110" +editKernelLocalversion "-dos.p111" 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 3f7b22ce..f55cfb65 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 @@ -93,6 +93,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-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-32981/4.9/0004.patch @@ -111,5 +112,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-41850/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/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-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p111" +editKernelLocalversion "-dos.p112" 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 82d2d8dc..86ffac98 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 @@ -340,6 +340,8 @@ 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/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/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-24448/4.9/0004.patch @@ -370,5 +372,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p370" +editKernelLocalversion "-dos.p372" 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 fe8964bf..0c78a703 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 @@ -395,12 +395,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -431,5 +434,5 @@ 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.p431" +editKernelLocalversion "-dos.p434" 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 1c0e33d5..4e794c39 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 @@ -450,6 +450,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -494,5 +496,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.p494" +editKernelLocalversion "-dos.p496" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 520e2663..74116bc7 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_tzdb2022f; + repopick -it S_asb_2022-12; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index ae1e659c..735f4f30 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -196,6 +196,11 @@ if enterAndClear "frameworks/libs/systemui"; then applyPatch "$DOS_PATCHES/android_frameworks_libs_systemui/0001-Icon_Cache.patch"; #Invalidate icon cache between OS releases (GrapheneOS) fi; +if enterAndClear "frameworks/minikin"; then +git fetch https://github.com/LineageOS/android_frameworks_minikin refs/changes/57/345357/1 && git cherry-pick FETCH_HEAD; #S_asb_2022-12 +git fetch https://github.com/LineageOS/android_frameworks_minikin refs/changes/58/345358/1 && git cherry-pick FETCH_HEAD; #S_asb_2022-12 +fi; + if enterAndClear "frameworks/native"; then applyPatch "$DOS_PATCHES/android_frameworks_native/0001-Sensors_Permission.patch"; #Require OTHER_SENSORS permission for sensors (GrapheneOS) applyPatch "$DOS_PATCHES/android_frameworks_native/0001-Sensors_Permission-a1.patch"; #Protect step sensors with OTHER_SENSORS permission for targetSdk<29 apps (GrapheneOS) 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 b5d7618c..84f25892 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 @@ -298,6 +298,8 @@ 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-20369/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -337,5 +339,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p337" +editKernelLocalversion "-dos.p339" 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 d89449c4..c1b07f82 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 @@ -110,6 +110,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3649/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25677/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.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 @@ -130,5 +134,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.14/0002.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-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p130" +editKernelLocalversion "-dos.p134" 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 b04f94da..89092927 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 @@ -111,6 +111,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4095/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26365/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26373/4.19/0004.patch @@ -134,5 +136,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.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-2022-45934/^6.0/0001.patch -editKernelLocalversion "-dos.p134" +editKernelLocalversion "-dos.p136" 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 d5838dee..b9d3a736 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 @@ -336,6 +336,8 @@ 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/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20566/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/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-24448/4.9/0004.patch @@ -366,5 +368,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p366" +editKernelLocalversion "-dos.p368" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index e97eb7b6..08fc0d16 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 @@ -364,11 +364,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20369/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25712/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -398,5 +401,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.0/0001.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.p398" +editKernelLocalversion "-dos.p401" cd "$DOS_BUILD_BASE" 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 8e74e2b4..13be28e6 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 @@ -333,6 +333,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/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-20566/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.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 @@ -377,5 +379,5 @@ 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.p377" +editKernelLocalversion "-dos.p379" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Functions.sh b/Scripts/LineageOS-20.0/Functions.sh index 7120ff32..815afca4 100644 --- a/Scripts/LineageOS-20.0/Functions.sh +++ b/Scripts/LineageOS-20.0/Functions.sh @@ -104,7 +104,8 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 344891; #fixup! Rewrite trust USB restriction handling - #repopick -it T_tzdb2022f; + repopick -it T_tzdb2022f; + #repopick -it T_asb_2022-12; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";