diff --git a/Patches/Linux b/Patches/Linux index c05a23a0..d45f3eb0 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit c05a23a0b7746e55eb07a8abadbe51fe032c1658 +Subproject commit d45f3eb0e8dbaa0955160fa5861986342f8c6d84 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 08c9b0ee..306c2a7f 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -49,7 +49,6 @@ commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18 commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_google_redbull.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600"; -commentPatches android_kernel_google_sunfish.sh "CVE-2021-20317"; commentPatches android_kernel_google_wahoo.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514"; commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559"; 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 f5e9a6a9..68f06d37 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 @@ -318,7 +318,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.19/0003.patch @@ -384,5 +383,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.p384" +editKernelLocalversion "-dos.p383" 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 e9c369fa..031ab1cf 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 @@ -383,7 +383,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -432,5 +431,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.p432" +editKernelLocalversion "-dos.p431" 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 038cd816..af1d5dc3 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 @@ -128,7 +128,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -179,5 +178,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p179" +editKernelLocalversion "-dos.p178" 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 b29dfb1a..225c90e3 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 @@ -99,8 +99,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.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 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.4/0007.patch -editKernelLocalversion "-dos.p102" +editKernelLocalversion "-dos.p99" 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 f20f1d5e..7bbb7b8e 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 @@ -126,7 +126,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -176,5 +175,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p176" +editKernelLocalversion "-dos.p175" 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 d730b11a..f6b0d88b 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 @@ -118,7 +118,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.19/0003.patch @@ -190,5 +189,5 @@ 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.p190" +editKernelLocalversion "-dos.p189" 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 e194576f..1c6c0ad0 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 @@ -123,7 +123,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -173,5 +172,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p173" +editKernelLocalversion "-dos.p172" 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 4fdf0a5e..df7d9ce6 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 @@ -186,7 +186,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -241,5 +240,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.p241" +editKernelLocalversion "-dos.p240" 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 beac0ec2..7d614ab3 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 @@ -220,7 +220,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3744/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch @@ -275,5 +274,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.p275" +editKernelLocalversion "-dos.p274" 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 20ba0482..1bab7e78 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 @@ -248,7 +248,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3760/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/4.19/0003.patch @@ -316,5 +315,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.p316" +editKernelLocalversion "-dos.p315" cd "$DOS_BUILD_BASE"