From f2e1d32eba0c0c2066e34186131c1c93ab0c7d15 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 6 Oct 2021 15:07:36 -0400 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- Patches/Linux | 2 +- Scripts/LineageOS-14.1/Functions.sh | 1 - Scripts/LineageOS-15.1/Functions.sh | 3 ++- Scripts/LineageOS-16.0/Functions.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 ++- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 3 ++- .../CVE_Patchers/android_kernel_google_sunfish.sh | 3 ++- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_razer_msm8998.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 3 ++- 18 files changed, 33 insertions(+), 18 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 845c6dda..343b64b7 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 845c6ddaf010162a23ca14e1f684a22c49d37a59 +Subproject commit 343b64b700619f38daf74d11cbfbc2d4363a6a28 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index cc851ffe..9a0987c0 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -95,7 +95,6 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; source build/envsetup.sh; #repopick -it bt-sbc-hd-dualchannel-nougat; - repopick -it n-asb-2021-08; repopick -i 315718; #CVE-2021-1957 repopick -it n-asb-2021-09; repopick -it n-asb-2021-10; diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 37f7a9eb..c648c34c 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -85,7 +85,8 @@ patchWorkspace() { umask 0022; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; + repopick -it O_asb_2021-10; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 9e9024af..78933887 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -73,8 +73,9 @@ patchWorkspace() { umask 0022; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - #source build/envsetup.sh; + source build/envsetup.sh; #repopick -it pie-firewall; + repopick -it P_asb_2021-10; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; 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 907cc149..acd06a12 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 @@ -360,6 +360,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch @@ -370,5 +371,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.p370" +editKernelLocalversion "-dos.p371" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index aba1b596..23754395 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -415,10 +415,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.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.p420" +editKernelLocalversion "-dos.p421" 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 8a3b83b4..740ef16e 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 @@ -167,6 +167,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p168" +editKernelLocalversion "-dos.p169" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh index a1959425..1c1dbb87 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0285-0286.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0004.patch @@ -100,5 +101,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0016.patch -- git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch -editKernelLocalversion "-dos.p100" +editKernelLocalversion "-dos.p101" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index 5dfd85e2..d8fe927e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0285-0286.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -55,5 +56,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p55" +editKernelLocalversion "-dos.p56" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh index 8ab35a1d..2dfddec0 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh @@ -166,6 +166,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p167" +editKernelLocalversion "-dos.p168" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh index 607e2a86..9d901076 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -174,10 +174,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p179" +editKernelLocalversion "-dos.p180" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh index 4aa8034e..9f321e4e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh @@ -163,6 +163,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p164" +editKernelLocalversion "-dos.p165" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh index 7b57d0df..f2154d97 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/wahoo" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0285-0286.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch @@ -74,5 +75,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p74" +editKernelLocalversion "-dos.p75" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 2d2acca1..1438a78e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0284-0285.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0285-0286.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -51,5 +52,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -editKernelLocalversion "-dos.p51" +editKernelLocalversion "-dos.p52" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index a0246090..f94df7be 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -225,9 +225,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p229" +editKernelLocalversion "-dos.p230" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh index a3d52dcd..eb07a686 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0285-0286.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -53,5 +54,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p53" +editKernelLocalversion "-dos.p54" 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 ae2499c2..3859bad0 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 @@ -259,9 +259,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p263" +editKernelLocalversion "-dos.p264" 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 d8bf9605..b7baa25b 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 @@ -293,6 +293,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/^5.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch @@ -302,5 +303,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.p302" +editKernelLocalversion "-dos.p303" cd "$DOS_BUILD_BASE"