diff --git a/Patches/Linux b/Patches/Linux index 4c53d07b..5a9111c4 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 4c53d07bb4438d5cf24daf85b61febf4f7410a74 +Subproject commit 5a9111c4f031a07e04271fcd23c9f4045f045e9b 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 33c98acd..3d0d98dc 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 @@ -713,7 +713,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -761,5 +762,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-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p761" +editKernelLocalversion "-dos.p762" cd "$DOS_BUILD_BASE" 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 00e8cd0f..32f60b7d 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 @@ -380,7 +380,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -423,5 +424,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.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-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p423" +editKernelLocalversion "-dos.p424" 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 a26a8ea7..30aa760b 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 @@ -394,7 +394,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -459,5 +460,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p459" +editKernelLocalversion "-dos.p460" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh index 0da3a82d..6e6e0817 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_d2.sh @@ -463,7 +463,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -531,5 +532,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch -editKernelLocalversion "-dos.p531" +editKernelLocalversion "-dos.p532" 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 0e8ea40a..2eeda1af 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 @@ -174,7 +174,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -216,5 +217,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p216" +editKernelLocalversion "-dos.p217" cd "$DOS_BUILD_BASE" 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 888ac86b..44b693c2 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 @@ -296,7 +296,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -337,5 +338,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p337" +editKernelLocalversion "-dos.p338" cd "$DOS_BUILD_BASE" 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 9925a463..baab1c2a 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 @@ -365,7 +365,8 @@ 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-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -398,5 +399,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p398" +editKernelLocalversion "-dos.p399" 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 4be810c5..764e6637 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 @@ -359,7 +359,8 @@ 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-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -392,5 +393,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch -editKernelLocalversion "-dos.p392" +editKernelLocalversion "-dos.p393" 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 141035e3..ebb8d40d 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 @@ -637,7 +637,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.18/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -720,5 +721,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p720" +editKernelLocalversion "-dos.p721" 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 b4a234c6..fd30107e 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 @@ -596,7 +596,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0005.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.18/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.18/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -684,5 +685,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p684" +editKernelLocalversion "-dos.p685" 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 4a9e233b..7d739920 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 @@ -345,7 +345,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -416,5 +417,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy 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/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch -editKernelLocalversion "-dos.p416" +editKernelLocalversion "-dos.p417" 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 63540c43..976725e1 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 @@ -558,7 +558,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -605,5 +606,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy 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-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch -editKernelLocalversion "-dos.p605" +editKernelLocalversion "-dos.p606" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 3733b55c..a3a52b35 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 @@ -485,7 +485,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -573,5 +572,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p573" +editKernelLocalversion "-dos.p572" 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 65ac6868..536a14a2 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 @@ -577,7 +577,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -663,5 +662,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p663" +editKernelLocalversion "-dos.p662" 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 3167aeb4..77c9b5fd 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 @@ -303,7 +303,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -377,5 +378,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch -editKernelLocalversion "-dos.p377" +editKernelLocalversion "-dos.p378" 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 92be02da..c64b08bf 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 @@ -558,7 +558,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch @@ -605,5 +606,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy 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-2013-4592/3.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.4/0008.patch -editKernelLocalversion "-dos.p605" +editKernelLocalversion "-dos.p606" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh index ad5899bc..fe37de00 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_msm8937.sh @@ -324,7 +324,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -435,5 +434,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p435" +editKernelLocalversion "-dos.p434" 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 a3b4d2c7..e6eafede 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 @@ -490,7 +490,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -581,5 +580,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p581" +editKernelLocalversion "-dos.p580" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh index 5dc4b0a4..991df4b0 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -387,7 +387,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -479,5 +478,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p479" +editKernelLocalversion "-dos.p478" 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 0892deee..81bb27bf 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 @@ -337,7 +337,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -383,5 +384,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-sy 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/Untracked-02/ANY/kernel.msm.git-5d89eb01c93d8a62998e3bdccae28a7732e3bd51.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a523207486701b2d34607137558066f.patch -editKernelLocalversion "-dos.p383" +editKernelLocalversion "-dos.p384" 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 01f2ee15..5e15a260 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 @@ -406,7 +406,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -478,5 +479,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch -editKernelLocalversion "-dos.p478" +editKernelLocalversion "-dos.p479" 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 6b4e7235..e7147218 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 @@ -331,7 +331,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -401,5 +402,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch -editKernelLocalversion "-dos.p401" +editKernelLocalversion "-dos.p402" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_mako.sh index de5c0fa6..8ff3a31d 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 @@ -244,7 +244,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-1000204/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2215/3.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2331/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/3.4/0002.patch @@ -311,7 +310,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20096/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20636/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.10/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/3.4/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0305/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.4/0002.patch @@ -359,7 +357,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -382,10 +381,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/3.4/0025.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39686/3.4/0027.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39686/3.4/0028.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39686/3.4/0029.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39686/3.4/0030.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-42008/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.4/0004.patch @@ -423,5 +418,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch -editKernelLocalversion "-dos.p423" +editKernelLocalversion "-dos.p418" 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 e56dc2bb..1922a67f 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 @@ -322,7 +322,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/3.4/0007.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/3.4/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch @@ -389,5 +390,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/3.4/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25258/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25375/3.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-28390/4.4/0008.patch -editKernelLocalversion "-dos.p389" +editKernelLocalversion "-dos.p390" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 02a4e9f0..6d9e3af3 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 @@ -472,7 +472,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch @@ -560,5 +559,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p560" +editKernelLocalversion "-dos.p559" 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 f3107a0b..24ea52a9 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 @@ -383,7 +383,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/4.4/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1955/qcacld-2.0/0003.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch @@ -479,5 +478,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch -editKernelLocalversion "-dos.p479" +editKernelLocalversion "-dos.p478" cd "$DOS_BUILD_BASE"