diff --git a/Patches/Linux b/Patches/Linux index 1f4748c3..5a9c2ca2 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 1f4748c38294369ce6fb82401478d28434fe0677 +Subproject commit 5a9c2ca2304a1716abbf67e1d10c3c84de3edfb8 diff --git a/PrebuiltApps b/PrebuiltApps index 77fd3e3f..fc3d6a42 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 77fd3e3f764a19a28ca2db68d563b2896c10a5c5 +Subproject commit fc3d6a42a799911d9d3fe4a91dc43345c18f30d3 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index 9bb2124c..9b02b99c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -378,6 +378,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.16-^4.17.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13406/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/3.18/0003.patch @@ -589,6 +590,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -620,5 +623,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch 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 -editKernelLocalversion "-dos.p620" +editKernelLocalversion "-dos.p623" cd "$DOS_BUILD_BASE" 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 ae1ca85d..625c65bc 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 @@ -356,6 +356,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13406/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14634/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/3.18/0003.patch @@ -544,6 +545,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -579,5 +582,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch 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 -editKernelLocalversion "-dos.p579" +editKernelLocalversion "-dos.p582" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 163b5342..6541cfdc 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -177,6 +177,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13900/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13913/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch @@ -430,6 +431,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -460,5 +463,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p460" +editKernelLocalversion "-dos.p463" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh index ab68b2a4..84e06614 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -240,6 +240,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13900/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13913/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch @@ -497,6 +498,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -527,5 +530,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch 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 -editKernelLocalversion "-dos.p527" +editKernelLocalversion "-dos.p530" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh index f1c7cc17..92603e37 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh @@ -109,6 +109,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/^4.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-20856/3.18/0002.patch @@ -266,6 +267,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -299,5 +302,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p299" +editKernelLocalversion "-dos.p302" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index edab5f7b..7ff73034 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -139,6 +139,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-18690/^4.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-19824/3.18/0003.patch @@ -329,6 +330,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -365,5 +368,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p365" +editKernelLocalversion "-dos.p368" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index d20be71f..f0fe1bc2 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -151,6 +151,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch @@ -387,6 +388,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -418,5 +421,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p418" +editKernelLocalversion "-dos.p421" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index f233d5f6..d3827e73 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -130,6 +130,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12232/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12896/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch @@ -332,6 +333,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -364,5 +367,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p364" +editKernelLocalversion "-dos.p367" 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 04e1f198..22e0cc2f 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 @@ -293,11 +293,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29264/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.19/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/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-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 -editKernelLocalversion "-dos.p299" +editKernelLocalversion "-dos.p300" 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 c3ecfd29..bafe8de6 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 @@ -361,10 +361,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.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-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p366" +editKernelLocalversion "-dos.p367" 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 b8fed0b0..5b2f2b16 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 @@ -137,8 +137,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.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.p140" +editKernelLocalversion "-dos.p141" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 6e4ab4ef..e0e6aa73 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -111,8 +111,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1905/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1906/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0036.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0037.patch @@ -150,5 +148,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -editKernelLocalversion "-dos.p150" +editKernelLocalversion "-dos.p148" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh index e420a4e3..82623fce 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -171,6 +171,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13913/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13914/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13919/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14609/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14633/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14734/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch @@ -418,6 +419,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -448,5 +451,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p448" +editKernelLocalversion "-dos.p451" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index ac5d6680..f5e2458e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -133,6 +133,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12232/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12896/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14612/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16276/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16862/3.18/0003.patch @@ -330,6 +331,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch @@ -362,5 +365,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch 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 -editKernelLocalversion "-dos.p362" +editKernelLocalversion "-dos.p365" 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 8e13122c..ef6bc5a1 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 @@ -159,9 +159,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/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-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p163" +editKernelLocalversion "-dos.p164" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index 26838db0..d51247ac 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -101,9 +101,7 @@ export -f buildAll; 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/lineage"; fi; - source build/envsetup.sh; - repopick -i 300595; #system/netd: add missing override keyword - #repopick -it android-11.0.0_r37; + #source build/envsetup.sh; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";