diff --git a/Manifests/Manifest_LAOS-18.1.xml b/Manifests/Manifest_LAOS-18.1.xml index 97add592..01e62c47 100644 --- a/Manifests/Manifest_LAOS-18.1.xml +++ b/Manifests/Manifest_LAOS-18.1.xml @@ -26,7 +26,6 @@ - diff --git a/Patches/Linux b/Patches/Linux index c3cea72b..cf5cea94 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit c3cea72b6d4e9521797b8c8de30e9cd06aff4040 +Subproject commit cf5cea943954c0feb614db2ef1fb92f587997ce4 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 2286efae..48243eb0 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -16,7 +16,6 @@ #along with this program. If not, see . umask 0022; set -euo pipefail; -source "$DOS_SCRIPTS_COMMON/Shell.sh"; commentPatches() { file="$1"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index b0604a18..c3d7af78 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -641,7 +641,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 0e880620..54e115ad 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -310,7 +310,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh index 61cacb26..5c083da1 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh @@ -328,7 +328,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index c708abca..5512440f 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -378,6 +378,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -394,5 +395,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p394" +editKernelLocalversion "-dos.p395" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index 07f184ef..3dbbbf68 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -454,6 +454,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -470,5 +471,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p470" +editKernelLocalversion "-dos.p471" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 01b7b073..f7008fe5 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -487,6 +487,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -500,5 +501,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p500" +editKernelLocalversion "-dos.p501" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh index 6bee1ece..ffdbad8e 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh @@ -124,7 +124,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index 6b02ed38..9787ba2c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -233,7 +233,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index 18f11f90..673d58eb 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -190,6 +190,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch @@ -202,5 +203,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- 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/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p202" +editKernelLocalversion "-dos.p203" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh index 6ed68d14..6e56b44c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh @@ -185,6 +185,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/^5.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch @@ -197,5 +198,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- 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/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p197" +editKernelLocalversion "-dos.p198" cd "$DOS_BUILD_BASE" 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 1a7a9f83..700d9f4d 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 @@ -644,5 +644,6 @@ 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.p644" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p645" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh index fa927f31..2d573814 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -471,6 +471,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -487,5 +488,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p487" +editKernelLocalversion "-dos.p488" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh index f759bc8b..a877dacd 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_msm8916.sh @@ -252,6 +252,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -279,5 +280,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p279" +editKernelLocalversion "-dos.p280" 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 1fea09fe..1a445d9e 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 @@ -605,5 +605,6 @@ 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.p605" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p606" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index d8ff8783..70c6c1b9 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -280,7 +280,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index f1995db7..44fc7329 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -259,6 +259,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -274,5 +275,5 @@ git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/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/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p274" +editKernelLocalversion "-dos.p275" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh index ee84aca3..f2c6ff97 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -398,6 +398,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -415,5 +416,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p415" +editKernelLocalversion "-dos.p416" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index 0b342494..90070fb8 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -377,6 +377,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -393,5 +394,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p393" +editKernelLocalversion "-dos.p394" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 4e0c1cf2..745f919c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -391,6 +391,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -407,5 +408,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p407" +editKernelLocalversion "-dos.p408" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh index e62d0a6c..ec7a5b8f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -491,7 +491,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch 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 7509bd1f..d0ca762f 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 @@ -490,5 +490,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/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.p490" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p491" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh index 50403557..ae4903f3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -170,6 +170,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -188,5 +189,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p188" +editKernelLocalversion "-dos.p189" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 600ccd61..8232eafa 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -291,6 +291,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -305,5 +306,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p305" +editKernelLocalversion "-dos.p306" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 153ba5b7..b0f7e1f0 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -259,6 +259,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -273,5 +274,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p273" +editKernelLocalversion "-dos.p274" 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 aa9d98e5..8c597670 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 @@ -585,5 +585,6 @@ 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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 -editKernelLocalversion "-dos.p585" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p586" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh index c800f0d7..c1664d98 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_fugu.sh @@ -470,6 +470,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -486,5 +487,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p486" +editKernelLocalversion "-dos.p487" 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 ed53d2c1..6bb3857a 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 @@ -357,5 +357,6 @@ 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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 -editKernelLocalversion "-dos.p357" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p358" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index 757afec3..db0b00c0 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -248,6 +248,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -275,5 +276,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p275" +editKernelLocalversion "-dos.p276" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh index 43156d7e..dc7b036c 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_cyanogen_msm8974.sh @@ -235,7 +235,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh index 442d44c9..3acda61e 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_yellowstone.sh @@ -313,6 +313,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -327,5 +328,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/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/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p327" +editKernelLocalversion "-dos.p328" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh index 5691907e..5b166ebb 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_hammerhead.sh @@ -490,7 +490,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh index c800f0d7..c1664d98 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -470,6 +470,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -486,5 +487,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p486" +editKernelLocalversion "-dos.p487" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh index 757afec3..db0b00c0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_cyanogen_msm8916.sh @@ -248,6 +248,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -275,5 +276,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p275" +editKernelLocalversion "-dos.p276" 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 c178babe..fccd382a 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 @@ -411,5 +411,6 @@ 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.p411" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p412" 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 3e9aed6c..0478b65a 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 @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile 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 git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0027.patch @@ -277,6 +278,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -318,5 +320,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.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.p318" +editKernelLocalversion "-dos.p320" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh index 442d44c9..3acda61e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_yellowstone.sh @@ -313,6 +313,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -327,5 +328,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/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/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p327" +editKernelLocalversion "-dos.p328" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh index a91f3966..79141f45 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -338,7 +338,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 8c7f73ae..8623d321 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -310,6 +310,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch @@ -335,5 +336,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p335" +editKernelLocalversion "-dos.p336" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index de0007c4..c8e39d9f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -239,6 +239,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -253,5 +254,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p253" +editKernelLocalversion "-dos.p254" 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 7b2c3ed7..d66b5ae1 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 @@ -503,5 +503,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15815/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 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.p503" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p504" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index b269e8c3..37dbd3d4 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -240,6 +240,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -254,5 +255,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p254" +editKernelLocalversion "-dos.p255" 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 d89588c2..8b088bba 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,6 +318,8 @@ 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 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.19/0003.patch @@ -377,5 +379,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.p377" +editKernelLocalversion "-dos.p379" 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 a4356142..5aa81e6b 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 @@ -382,6 +382,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch @@ -417,13 +418,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch 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-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-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-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.p425" +editKernelLocalversion "-dos.p427" 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 46d8f2bf..83621b05 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,6 +128,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch @@ -169,9 +170,10 @@ 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-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-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-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.p175" 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 21381991..5501df18 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 @@ -4,6 +4,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0209-0210.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0233-0234.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.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 @@ -248,6 +249,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch @@ -285,5 +287,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.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.p285" +editKernelLocalversion "-dos.p287" 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 edf4b2cd..13a3e07c 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 @@ -4,6 +4,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0209-0210.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0233-0234.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.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 @@ -253,6 +254,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch @@ -291,5 +293,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.p291" +editKernelLocalversion "-dos.p293" 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 fb0fb5fe..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 @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0287-0288.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 +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 -editKernelLocalversion "-dos.p100" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" 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 ecd4b766..835aec16 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 @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/fairphone/sdm632" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0239-0240.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.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 @@ -237,6 +238,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -286,5 +288,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.p286" +editKernelLocalversion "-dos.p288" 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 25e9aee5..422f5744 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 @@ -3,6 +3,7 @@ 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/0001-LinuxIncrementals/4.4/4.4.0286-0287.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0287-0288.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.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 @@ -49,6 +50,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch 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-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn editKernelLocalversion "-dos.p50" 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 e67e1ac8..a056743e 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,6 +126,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch @@ -168,9 +169,10 @@ 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-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-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-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.p172" +editKernelLocalversion "-dos.p174" 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 b5558640..f8c9d126 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 @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm-4.9" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0252-0253.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.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 @@ -137,6 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -176,5 +178,5 @@ 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-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p176" +editKernelLocalversion "-dos.p178" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh index 6ae1e448..686eb3af 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh @@ -270,7 +270,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.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 bb297139..08910ddd 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 @@ -119,6 +119,8 @@ 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 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.19/0003.patch @@ -186,5 +188,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.p186" +editKernelLocalversion "-dos.p188" 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 bf60b302..90b55330 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,6 +123,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch @@ -165,9 +166,10 @@ 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-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-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-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.p169" +editKernelLocalversion "-dos.p171" 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 05ae729d..bcc3f3f5 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 @@ -2,6 +2,7 @@ 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/0001-LinuxIncrementals/4.4/4.4.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.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 @@ -76,6 +77,7 @@ 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-20320/^5.15/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p77" +editKernelLocalversion "-dos.p79" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh index bbe1f298..5b95b859 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -335,7 +335,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh index e9cf5273..005d3125 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -267,7 +267,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch 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 6a1f518b..8faa99ab 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 @@ -287,7 +287,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 3437f3e2..c16fdb87 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -258,7 +258,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch 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 5e8e4a22..9c2bc050 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 @@ -478,5 +478,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/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.p478" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p479" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh index fce36c0c..cd3aa5b8 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_moto_shamu.sh @@ -158,6 +158,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/^5.12/0001.patch @@ -174,5 +175,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-ch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p174" +editKernelLocalversion "-dos.p175" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 74dcf6f3..9d90ac26 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -332,7 +332,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh index 2e350b05..16ee7699 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_nextbit_msm8992.sh @@ -288,6 +288,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/^5.12/0001.patch @@ -302,5 +303,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/^5.2.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p302" +editKernelLocalversion "-dos.p303" 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 5d1940e8..f9ad6388 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 @@ -400,5 +400,6 @@ 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-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 -editKernelLocalversion "-dos.p400" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch +editKernelLocalversion "-dos.p401" 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 226c373a..e38b5a1c 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,9 +1,5 @@ #!/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/0001-LinuxIncrementals/4.4/4.4.0286-0287.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0287-0288.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 @@ -54,5 +50,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.p54" +editKernelLocalversion "-dos.p50" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 54dfe725..f985f724 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/sdm845" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0239-0240.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0242-0243.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0005-Graphene-Deny_USB/4.9/0002.patch 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 @@ -195,6 +196,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch @@ -235,5 +237,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.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.p235" +editKernelLocalversion "-dos.p237" 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 e285bd0e..e4640d9a 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 @@ -185,6 +185,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch @@ -227,12 +228,13 @@ 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-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-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-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-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.p234" +editKernelLocalversion "-dos.p236" 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 59aed646..33fd114b 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 @@ -2,6 +2,7 @@ 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/0001-LinuxIncrementals/4.4/4.4.0286-0287.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0288-0289.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,6 +56,7 @@ 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-20320/^5.15/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p56" +editKernelLocalversion "-dos.p58" 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 154d5acb..987a1f4f 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,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/sdm845" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0286-0287.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 @@ -74,6 +75,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/4.9/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p75" +editKernelLocalversion "-dos.p77" 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 ac1fdfb1..d8b2f168 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 @@ -292,7 +292,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch 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 c88b2a39..8cb244c5 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 @@ -365,7 +365,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27066/^5.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/^5.9/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/3.0-^3.10/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/^5.11/0001.patch 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 31707cac..268feb32 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 @@ -219,6 +219,7 @@ 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-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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch @@ -261,12 +262,13 @@ 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-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-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-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-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.p268" +editKernelLocalversion "-dos.p270" 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 d205396d..142b6885 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,6 +248,8 @@ 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 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20322/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.19/0003.patch @@ -309,5 +311,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.p309" +editKernelLocalversion "-dos.p311" cd "$DOS_BUILD_BASE"