From f77971d38fe5defc65003d3a954add0df77c094d Mon Sep 17 00:00:00 2001 From: Tad Date: Tue, 31 Aug 2021 18:35:07 -0400 Subject: [PATCH] Small tweaks Signed-off-by: Tad --- Patches/Linux | 2 +- PrebuiltApps | 2 +- Scripts/Common/Functions.sh | 4 +- .../android_kernel_google_wahoo.sh | 141 +----------------- .../android_kernel_oneplus_msm8998.sh | 7 +- 5 files changed, 10 insertions(+), 146 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 381e1493..5b519d35 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 381e1493313c826137c32e84ffbee81b60f7c934 +Subproject commit 5b519d3549512e5ba6428e3a1df6856562d50a8a diff --git a/PrebuiltApps b/PrebuiltApps index ec26f027..5ebbdf76 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit ec26f027ec3a9293c80c1cd66e8b509b361ad3f8 +Subproject commit 5ebbdf76ecff77952ac43d0a0652dd99e177b14e diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index f7bc3ce4..94e07859 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -178,9 +178,9 @@ processRelease() { elif [[ "$VERITY" == "avb" ]]; then #TODO: Verify if both SHA512 and RSA4096 is always supported local VERITY_SWITCHES=(--avb_vbmeta_key "$KEY_DIR/avb.pem" \ - --avb_vbmeta_algorithm SHA512_RSA4096 \ + --avb_vbmeta_algorithm SHA256_RSA4096 \ --avb_system_key "$KEY_DIR/avb.pem" \ - --avb_system_algorithm SHA512_RSA4096); + --avb_system_algorithm SHA256_RSA4096); local AVB_PKMD="$KEY_DIR/avb_pkmd.bin"; echo -e "\e[0;32m\t+ Verified Boot 2.0\e[0m"; fi; 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 449ea08d..50ec381b 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 @@ -1,8 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/wahoo" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0242-0243.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0244-0245.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0251-0252.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.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/0006-AndroidHardening-Kernel_Hardening/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch @@ -20,7 +19,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0015.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0017.patch -git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0018.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0019.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0021.patch @@ -33,22 +31,20 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6187/^4.6.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-8394/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9919/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.4/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9059/^4.11.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9211/^4.11.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9699/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11065/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14886/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16644/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18061/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18174/^4.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18204/4.4/0004.patch @@ -56,155 +52,28 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-3575/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5902/4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5906/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-10323/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13094/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-16597/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10622/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10626/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14038/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14039/4.4/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14047/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16232/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19054/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19060/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19061/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19815/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0021.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0022.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0023.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0024.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.4/0025.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-1749/4.4/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.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-8992/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10135/4.4/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10711/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10766/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/3.6-^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.4/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12769/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16166/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25212/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25284/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25285/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25673/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26558/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28097/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/4.4/0015.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0017.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0018.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.4/0020.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35519/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0014.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch -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 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0016.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0017.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0018.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26932/4.4/0020.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28038/4.4/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28660/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.4/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.4/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38204/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38205/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch -editKernelLocalversion "-dos.p206" +editKernelLocalversion "-dos.p75" 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 3073ba31..9f975ff0 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -1,8 +1,5 @@ #!/bin/bash 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 @@ -59,7 +56,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-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.p61" +editKernelLocalversion "-dos.p56" cd "$DOS_BUILD_BASE"