From f2d87b1e8198e27a78ffc5e2c902100bc2ac175d Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 3 Jan 2023 18:36:19 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 4 +++- .../CVE_Patchers/android_kernel_sony_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 5 ++++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 3 ++- .../android_kernel_google_gs101_private_gs-google.sh | 5 ++++- .../android_kernel_google_gs201_private_gs-google.sh | 5 ++++- .../CVE_Patchers/android_kernel_google_msm-4.9.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 5 ++++- .../CVE_Patchers/android_kernel_oneplus_sm8350.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_sdm845.sh | 4 +++- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 4 +++- 13 files changed, 39 insertions(+), 13 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 1a666f79..fa819a2a 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 1a666f79df53e67a38ddbf596153261ae097c267 +Subproject commit fa819a2a0409159967934526c438774e6f72df4e 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 262bea1b..ceac39fe 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 @@ -318,6 +318,8 @@ 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-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25721/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 @@ -349,5 +351,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p349" +editKernelLocalversion "-dos.p351" 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 6068c129..c2eaa90b 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 @@ -355,6 +355,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -382,5 +384,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/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.p382" +editKernelLocalversion "-dos.p384" 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 fc4d5bb8..5eef6941 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 @@ -411,6 +411,9 @@ 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-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25717/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25721/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 @@ -445,5 +448,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.p445" +editKernelLocalversion "-dos.p448" 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 fb7e4e51..43884c8e 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 @@ -472,6 +472,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.19/0006.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-25715/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -510,5 +511,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.p510" +editKernelLocalversion "-dos.p511" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh index 695edf80..19afddba 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh @@ -161,5 +161,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47946/5.10/0002.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.p161" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-20928/ANY/0001.patch +editKernelLocalversion "-dos.p164" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh index 21165087..d453a9c6 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh @@ -161,5 +161,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-47946/5.10/0002.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.p161" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-20928/ANY/0001.patch +editKernelLocalversion "-dos.p164" 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 e15af821..cbc0216e 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 @@ -74,8 +74,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.9/0006.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-25664/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/0001.patch -editKernelLocalversion "-dos.p77" +editKernelLocalversion "-dos.p79" 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 98672df3..55625212 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 @@ -351,6 +351,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch @@ -378,5 +380,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-43750/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/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.p378" +editKernelLocalversion "-dos.p380" 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 3af95000..69ade409 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 @@ -379,6 +379,9 @@ 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-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25717/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25721/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 @@ -412,5 +415,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/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.p412" +editKernelLocalversion "-dos.p415" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8350.sh index 6d5de6b6..047b98aa 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 @@ -53,5 +53,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42895/5.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896/5.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42896-extra/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/0001.patch -editKernelLocalversion "-dos.p53" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-OctWirelessASB/ANY/0009.patch +editKernelLocalversion "-dos.p54" 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 b07fbe66..c3e2c44e 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 @@ -67,8 +67,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3643/4.9/0006.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-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/0001.patch -editKernelLocalversion "-dos.p70" +editKernelLocalversion "-dos.p72" 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 6e7c365b..9f690ebb 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 @@ -68,8 +68,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3424/^6.1/0001.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-25715/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25722/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-36280/^6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45934/^6.1/0001.patch -editKernelLocalversion "-dos.p71" +editKernelLocalversion "-dos.p73" cd "$DOS_BUILD_BASE"