diff --git a/Patches/Linux b/Patches/Linux index 31bf0e1f..381e1493 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 31bf0e1fa6f5278ee59fc0adff69c5d6e5a70ff5 +Subproject commit 381e1493313c826137c32e84ffbee81b60f7c934 diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 9d322293..c51c6643 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -95,7 +95,6 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/cm"; fi; source build/envsetup.sh; #repopick -it bt-sbc-hd-dualchannel-nougat; - repopick -it n-asb-2021-07; repopick -it n-asb-2021-08; source "$DOS_SCRIPTS/Patch.sh"; diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 577ecae1..042cbea9 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -111,10 +111,6 @@ patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch" fi; fi; -if enterAndClear "frameworks/opt/net/voip"; then -git pull "https://github.com/LineageOS/android_frameworks_opt_net_voip" refs/changes/74/313374/1; #n-asb-2021-07 -fi; - if enterAndClear "frameworks/opt/net/wifi"; then #Fix an issue when permision review is enabled that prevents using the Wi-Fi quick tile (AndroidHardening) #See https://github.com/AndroidHardening/platform_frameworks_opt_net_wifi/commit/c2a2f077a902226093b25c563e0117e923c7495b 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 4abd1f08..91583f31 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 @@ -254,10 +254,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch @@ -299,5 +301,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.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.p299" +editKernelLocalversion "-dos.p301" 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 e72bcf5a..d447e07a 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 @@ -152,11 +152,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.19/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-7053/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.19/0005.patch @@ -291,9 +291,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3600/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch @@ -351,5 +354,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.p351" +editKernelLocalversion "-dos.p354" 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 9cc5218b..be460249 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 @@ -228,11 +228,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3647/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3694/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-7053/4.14/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8992/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/4.14/0004.patch @@ -364,8 +364,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -407,5 +409,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p407" +editKernelLocalversion "-dos.p409" 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 144d35a9..a8e769e3 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 @@ -232,10 +232,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch @@ -274,5 +276,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p274" +editKernelLocalversion "-dos.p276" 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 0311315c..9a3c6e52 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 @@ -237,10 +237,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch @@ -280,5 +282,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.p280" +editKernelLocalversion "-dos.p282" 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 22586a63..2e97399b 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,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0281-0282.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 @@ -103,6 +104,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-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch editKernelLocalversion "-dos.p104" 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 eaed2879..08067bdd 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 @@ -214,10 +214,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch @@ -259,5 +261,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.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.p259" +editKernelLocalversion "-dos.p261" 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 9644b6d1..c6a67752 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 @@ -1,8 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0276-0277.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0277-0278.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0281-0282.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 @@ -56,6 +54,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-2020-24587/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch -editKernelLocalversion "-dos.p57" +editKernelLocalversion "-dos.p54" 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 ed2fdce2..7c0b6743 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 @@ -58,11 +58,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch @@ -103,11 +103,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -150,5 +153,5 @@ 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-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p150" +editKernelLocalversion "-dos.p153" 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 f7f924ed..0af964c3 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 @@ -115,10 +115,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch @@ -158,5 +160,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p158" +editKernelLocalversion "-dos.p160" cd "$DOS_BUILD_BASE" 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 f9d690fa..9c1326c3 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 @@ -50,11 +50,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch @@ -99,10 +99,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3600/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.19/0004.patch @@ -168,5 +171,5 @@ 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-2020-29660/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p168" +editKernelLocalversion "-dos.p171" 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 75f37e8a..c62615e9 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 @@ -59,11 +59,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch @@ -104,11 +104,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -151,5 +154,5 @@ 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-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p151" +editKernelLocalversion "-dos.p154" 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 ab770260..449ea08d 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 @@ -164,10 +164,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-21781/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.4/0005.patch @@ -204,5 +206,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch -editKernelLocalversion "-dos.p204" +editKernelLocalversion "-dos.p206" 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 1d3bbf19..3073ba31 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 @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0276-0277.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0277-0278.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0281-0282.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 @@ -58,6 +59,7 @@ 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-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch -editKernelLocalversion "-dos.p59" +editKernelLocalversion "-dos.p61" 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 ba24e241..094d0038 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 @@ -174,10 +174,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch @@ -218,5 +220,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-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p218" +editKernelLocalversion "-dos.p220" 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 822afe5a..72faa34f 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 @@ -75,11 +75,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0465/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch @@ -158,11 +158,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -208,5 +211,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p208" +editKernelLocalversion "-dos.p211" 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 db4e6f64..9af3e1cb 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 @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/razer/msm8998" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0279-0280.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0281-0282.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 @@ -52,6 +53,7 @@ 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-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch -editKernelLocalversion "-dos.p53" +editKernelLocalversion "-dos.p55" 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 55265a10..30cfa125 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 @@ -72,6 +72,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p73" +editKernelLocalversion "-dos.p74" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 1fc46a72..277acae6 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -72,6 +72,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -editKernelLocalversion "-dos.p73" +editKernelLocalversion "-dos.p74" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index b919d308..ae2057bc 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 @@ -82,11 +82,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10732/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10757/4.14/0002.patch @@ -189,11 +189,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/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-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -239,5 +242,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch -editKernelLocalversion "-dos.p239" +editKernelLocalversion "-dos.p242" 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 6346f028..3fd6f4a4 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 @@ -87,11 +87,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.19/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.19/0019.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.19/0020.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.19/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/^5.10/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.19/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-4788/4.19/0010.patch @@ -216,10 +216,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3600/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch @@ -279,5 +282,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.p279" +editKernelLocalversion "-dos.p282" cd "$DOS_BUILD_BASE"