From 9e548cabf584ea425707583087981907c6a45a6a Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 3 Aug 2021 16:57:20 -0400 Subject: [PATCH] Fixup 3d69ad87 Tested to compile bacon, ether, and griffin kernels Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_zte_msm8930.sh | 3 +-- .../CVE_Patchers/android_kernel_htc_msm8960.sh | 3 +-- .../android_kernel_motorola_msm8916.sh | 11 +---------- .../android_kernel_asus_msm8916.sh | 7 +------ .../android_kernel_nextbit_msm8992.sh | 3 +-- .../android_kernel_oneplus_msm8994.sh | 3 +-- .../android_kernel_cyanogen_msm8916.sh | 7 +------ .../android_kernel_cyanogen_msm8974.sh | 4 +--- .../android_kernel_cyanogen_msm8916.sh | 7 +------ .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 +---- .../android_kernel_motorola_msm8992.sh | 3 +-- .../android_kernel_motorola_msm8996.sh | 18 +----------------- .../android_kernel_oneplus_msm8994.sh | 3 +-- .../CVE_Patchers/android_kernel_htc_msm8974.sh | 5 +---- .../CVE_Patchers/android_kernel_lge_g3.sh | 5 +---- .../CVE_Patchers/android_kernel_lge_msm8974.sh | 3 +-- .../android_kernel_motorola_msm8974.sh | 5 +---- .../android_kernel_nextbit_msm8992.sh | 3 +-- .../android_kernel_oppo_msm8974.sh | 5 +---- .../CVE_Patchers/android_kernel_samsung_jf.sh | 3 +-- .../android_kernel_samsung_msm8930-common.sh | 3 +-- 22 files changed, 22 insertions(+), 89 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 600ba198..1d4b0baa 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 600ba198332c4b452027f99d8233813962e51744 +Subproject commit 1d4b0baaa74f38b99c41cad0bbb83e50c7a1762c diff --git a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh index 060feaf5..e6913aef 100644 --- a/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh +++ b/Scripts/LineageOS-11.0/CVE_Patchers/android_kernel_zte_msm8930.sh @@ -533,7 +533,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch @@ -651,5 +650,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p651" +editKernelLocalversion "-dos.p650" cd "$DOS_BUILD_BASE" 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 e2e7eb19..33f2625a 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 @@ -221,7 +221,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.4/0002.patch @@ -340,5 +339,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/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p340" +editKernelLocalversion "-dos.p339" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 33541082..99905963 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -259,15 +259,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10881/3.10/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.10/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0003.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0004.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0008.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0009.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0010.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0011.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0012.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0013.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13053/3.10/0008.patch @@ -388,5 +379,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.p388" +editKernelLocalversion "-dos.p379" 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 130fe8d2..bdacd077 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 @@ -142,11 +142,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0009.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0010.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0011.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0012.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0013.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11918/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11955/prima/0001.patch --directory=drivers/staging/prima @@ -273,5 +268,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.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.p273" +editKernelLocalversion "-dos.p268" 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 4c5bef5d..8808516d 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 @@ -169,7 +169,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11860/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch @@ -304,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.p304" +editKernelLocalversion "-dos.p303" 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 29ff3f18..54fec817 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 @@ -139,7 +139,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11860/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch @@ -274,5 +273,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.p274" +editKernelLocalversion "-dos.p273" 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 3dc673d4..64c2c2c8 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 @@ -137,11 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0009.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0010.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0011.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0012.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0013.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11918/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11955/prima/0001.patch --directory=drivers/staging/prima @@ -269,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.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.p269" +editKernelLocalversion "-dos.p264" 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 90f26926..2b626c24 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 @@ -109,8 +109,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12011/3.4/0001.patch @@ -245,5 +243,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p245" +editKernelLocalversion "-dos.p243" 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 3dc673d4..64c2c2c8 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 @@ -137,11 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11273/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11286/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0009.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0010.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0011.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0012.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0013.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11918/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11955/prima/0001.patch --directory=drivers/staging/prima @@ -269,5 +264,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.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.p269" +editKernelLocalversion "-dos.p264" 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 9605b651..00a2b477 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 @@ -207,10 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11878/prima/0001.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch @@ -351,5 +348,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p351" +editKernelLocalversion "-dos.p348" 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 a9940a7c..84850459 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 @@ -121,7 +121,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11860/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch @@ -252,5 +251,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.p252" +editKernelLocalversion "-dos.p251" 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 d318bc63..ca826f14 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 @@ -176,20 +176,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11506/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11891/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0014.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0016.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0019.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0021.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0022.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0024.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0025.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0026.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0027.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0030.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0031.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0035.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0036.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11934/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11955/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 @@ -242,7 +228,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2213/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2268/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2297/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2299/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2302/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2307/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.18/0004.patch @@ -506,8 +491,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/3.18/0001.patch 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-2018-11904/qcacld-2.0/0034.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.p509" +editKernelLocalversion "-dos.p493" 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 7d615ef0..37ea8588 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 @@ -122,7 +122,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11860/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch @@ -253,5 +252,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.p252" 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 cd6ce392..f7338ab0 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 @@ -207,10 +207,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11878/prima/0001.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch @@ -348,5 +345,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p348" +editKernelLocalversion "-dos.p345" cd "$DOS_BUILD_BASE" 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 5e056fca..32153bf9 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 @@ -142,10 +142,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11878/prima/0001.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch @@ -280,5 +277,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p280" +editKernelLocalversion "-dos.p277" cd "$DOS_BUILD_BASE" 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 5142a226..5030ce03 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 @@ -137,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch @@ -268,5 +267,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p268" +editKernelLocalversion "-dos.p267" 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 c4ec771b..0f005ba4 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 @@ -215,10 +215,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11266/3.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11878/prima/0001.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11987/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11988/3.4/0001.patch @@ -345,5 +342,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/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p345" +editKernelLocalversion "-dos.p342" cd "$DOS_BUILD_BASE" 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 50a2deb6..092b957c 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 @@ -167,7 +167,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11832/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11860/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11902/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/qcacld-2.0/0032.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11919/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11927/qcacld-2.0/0001.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/ANY/0002.patch @@ -301,5 +300,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.p301" +editKernelLocalversion "-dos.p300" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 983232e2..b381696d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -166,10 +166,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10675/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10879/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11878/prima/0001.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11894/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0001.patch --directory=drivers/staging/prima -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-15594/^4.18.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16658/^4.18.6/0001.patch @@ -221,5 +218,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch 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-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p221" +editKernelLocalversion "-dos.p218" 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 4dde7792..7f6e6fdc 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 @@ -194,7 +194,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch @@ -306,5 +305,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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p306" +editKernelLocalversion "-dos.p305" 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 8feb6025..2b56a457 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 @@ -267,7 +267,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10880/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10882/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10883/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10940/^4.16.6/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11904/prima/0005.patch --directory=drivers/staging/prima git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11939/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-12233/^4.17.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13099/3.4/0002.patch @@ -379,5 +378,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-2019-19051/^5.3.11/0001.patch -editKernelLocalversion "-dos.p379" +editKernelLocalversion "-dos.p378" cd "$DOS_BUILD_BASE"