diff --git a/Manifests/Manifest_LAOS-15.1.xml b/Manifests/Manifest_LAOS-15.1.xml index f6ad413c..89355de4 100644 --- a/Manifests/Manifest_LAOS-15.1.xml +++ b/Manifests/Manifest_LAOS-15.1.xml @@ -91,7 +91,7 @@ - + diff --git a/Patches/Linux b/Patches/Linux index 164c19bd..f1691894 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 164c19bd8ccb51935f844aafa8f703667c9e6af2 +Subproject commit f1691894b7e2eefd889f817110f5c4435bcf2187 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 701c9dc5..ccbb35d7 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 @@ -666,6 +666,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch @@ -676,5 +677,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p676" +editKernelLocalversion "-dos.p677" 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 53dcf31b..b486f45e 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 @@ -627,6 +627,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch @@ -641,5 +642,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p641" +editKernelLocalversion "-dos.p642" 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 7b8fac05..2a984703 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 @@ -522,6 +522,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -529,5 +530,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p529" +editKernelLocalversion "-dos.p530" 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 8f3d2944..f1f7efd5 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 @@ -616,6 +616,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch @@ -624,5 +625,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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p624" +editKernelLocalversion "-dos.p625" 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 af1d6633..86471d1e 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 @@ -370,6 +370,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -394,5 +395,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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p394" +editKernelLocalversion "-dos.p395" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index 14470a99..7e2dc806 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -370,6 +370,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -394,5 +395,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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p394" +editKernelLocalversion "-dos.p395" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 997d4415..a8cacb72 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -83,8 +83,9 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; 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_2022-01; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; 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 c3ded42c..ac2d329c 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 @@ -437,6 +437,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch @@ -446,5 +447,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p446" +editKernelLocalversion "-dos.p447" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 6d843b07..1716b79d 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -333,7 +333,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0003.patch @@ -348,5 +349,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch 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 -editKernelLocalversion "-dos.p348" +editKernelLocalversion "-dos.p349" 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 a5553353..4439df5e 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 @@ -534,6 +534,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -542,5 +543,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directo 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 -editKernelLocalversion "-dos.p542" +editKernelLocalversion "-dos.p543" 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 a3fea141..91b6d940 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 @@ -392,7 +392,8 @@ 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-38300/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.19/0005.patch @@ -402,6 +403,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.19/0003.patch @@ -415,5 +417,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.p415" +editKernelLocalversion "-dos.p417" 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 09b61361..3925a0af 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 @@ -436,7 +436,8 @@ 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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch @@ -444,6 +445,7 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch @@ -452,5 +454,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.p452" +editKernelLocalversion "-dos.p454" 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 58c05e01..f0999678 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 @@ -187,7 +187,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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch @@ -196,10 +196,11 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p201" +editKernelLocalversion "-dos.p202" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index cd8a243a..03568662 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -293,6 +293,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch @@ -302,5 +303,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p302" +editKernelLocalversion "-dos.p303" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index 65c1ff02..88929c5f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -300,6 +300,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch @@ -310,5 +311,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p310" +editKernelLocalversion "-dos.p311" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index f8868749..389c4d83 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -97,9 +97,10 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; 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 ten-firewall; #repopick -i 318916; #Fix kernel build with glibc 2.34 + repopick -it Q_asb_2022-01; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 8ad25882..6a0bae7b 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -292,7 +292,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0003.patch @@ -315,5 +316,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch 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 -editKernelLocalversion "-dos.p315" +editKernelLocalversion "-dos.p316" 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 c9b50a63..b15b2e44 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 @@ -184,7 +184,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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch @@ -193,10 +193,11 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p198" +editKernelLocalversion "-dos.p199" 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 a0fc3e08..a087f02f 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 @@ -192,7 +192,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch 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 01f7b832..567ab074 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 @@ -204,7 +204,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-38300/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch @@ -214,6 +214,7 @@ 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.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.19/0003.patch @@ -223,5 +224,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.p223" +editKernelLocalversion "-dos.p224" 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 7f11e4e9..72189104 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 @@ -181,7 +181,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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch @@ -190,10 +190,11 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p195" +editKernelLocalversion "-dos.p196" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh index c8bdba01..b6fcff7e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -230,7 +230,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13405/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13917/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-14614/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/3.18/0005.patch @@ -408,5 +407,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0045.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0046.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch -editKernelLocalversion "-dos.p408" +editKernelLocalversion "-dos.p407" 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 bc3dbee3..7771c918 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 @@ -509,6 +509,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -516,5 +517,5 @@ 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p516" +editKernelLocalversion "-dos.p517" 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 1ee17511..0efbfbd8 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 @@ -431,6 +431,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/3.18/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-45095/^5.16/0001.patch @@ -439,5 +440,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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p439" +editKernelLocalversion "-dos.p440" 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 ac76aa4c..ed941c80 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 @@ -130,7 +130,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28941/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29372/^5.7/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29374/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0008.patch @@ -244,7 +243,8 @@ 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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch @@ -253,6 +253,7 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch @@ -261,5 +262,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.p261" +editKernelLocalversion "-dos.p262" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh index f04fc6db..a0626506 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0294-0295.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0295-0296.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -66,5 +67,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch -editKernelLocalversion "-dos.p66" +editKernelLocalversion "-dos.p67" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh index 65e99bac..5ba2038a 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -373,6 +373,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch @@ -407,5 +408,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p407" +editKernelLocalversion "-dos.p408" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh index 3a096a7a..4c0cba0d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_samsung_msm8930-common.sh @@ -450,6 +450,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch @@ -484,5 +485,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p484" +editKernelLocalversion "-dos.p485" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh index 09da306f..c62e4c6f 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm660.sh @@ -281,6 +281,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch @@ -290,5 +291,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p290" +editKernelLocalversion "-dos.p291" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh index 14b2c649..d6bea27e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_sony_sdm845.sh @@ -349,7 +349,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39636/ANY/0003.patch @@ -364,5 +365,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch 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 -editKernelLocalversion "-dos.p364" +editKernelLocalversion "-dos.p365" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 60e4caa8..0187f8b7 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0295-0296.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -65,5 +66,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch -editKernelLocalversion "-dos.p65" +editKernelLocalversion "-dos.p66" 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 8729f15b..84af3593 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 @@ -278,7 +278,8 @@ 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-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0003.patch @@ -287,6 +288,7 @@ 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-2021-42739/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch @@ -294,5 +296,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.p294" +editKernelLocalversion "-dos.p296" 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 be3d83c4..c27325b0 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 @@ -323,7 +323,8 @@ 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-38300/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/^5.14/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39657/4.19/0004.patch @@ -334,6 +335,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-41864/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42252/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42739/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43975/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.19/0003.patch @@ -346,5 +348,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.p346" +editKernelLocalversion "-dos.p348" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index f6625675..30a9116b 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -288,6 +288,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch @@ -298,5 +299,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p298" +editKernelLocalversion "-dos.p299" cd "$DOS_BUILD_BASE"