From 7854c05aa4c730dcda89ab37d7af51401ce0d027 Mon Sep 17 00:00:00 2001 From: Tad Date: Fri, 26 Aug 2022 16:22:04 -0400 Subject: [PATCH] Fixup Signed-off-by: Tad --- Scripts/Common/Fix_CVE_Patchers.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm8250.sh | 2 +- Scripts/LineageOS-19.1/Functions.sh | 2 +- Scripts/LineageOS-19.1/Patch.sh | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 52d21aee..9640a099 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -77,7 +77,7 @@ commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-11599" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2021-30324" "CVE-2021-45469"; commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992" "CVE-2020-24588/4.14/0018.patch" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-1184/^5.18/0001.patch"; -commentPatches android_kernel_oneplus_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600"; +commentPatches android_kernel_oneplus_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-1184/^5.18/0001.patch"; commentPatches android_kernel_oneplus_sm8350.sh "CVE-2018-5873" "CVE-2022-1184/^5.18/0001.patch"; commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0012.patch" "0008-Graphene-Kernel_Hardening/4.4/0014.patch" "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166"; commentPatches android_kernel_samsung_apq8084.sh "0006-AndroidHardening-Kernel_Hardening/3.10/0009.patch"; diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh index c28678f7..26d263ee 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8250.sh @@ -270,7 +270,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/4.19/0011.patch diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index a62a5fd8..f05a4dfe 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -91,7 +91,7 @@ buildAll() { buildDevice flame avb; buildDevice vayu avb; #SD865 - buildDevice instantnoodle avb; + buildDevice instantnoodle avb; #TODO: don't disable CONFIG_CORESIGHT_* buildDevice instantnoodlep avb; buildDevice kebab avb; buildDevice lmi avb; diff --git a/Scripts/LineageOS-19.1/Patch.sh b/Scripts/LineageOS-19.1/Patch.sh index 50a3ea57..a16b78c1 100644 --- a/Scripts/LineageOS-19.1/Patch.sh +++ b/Scripts/LineageOS-19.1/Patch.sh @@ -458,6 +458,7 @@ enableAutoVarInit || true; #Fix broken options enabled by hardenDefconfig() sed -i "s/CONFIG_PREEMPT_TRACER=n/CONFIG_PREEMPT_TRACER=y/" kernel/fairphone/sdm632/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile +sed -i "s/CONFIG_DEBUG_NOTIFIERS=y/# CONFIG_DEBUG_NOTIFIERS is not set/" kernel/google/msm-4.9/arch/arm64/configs/*_defconfig; #Likely breaks boot echo -e "\nCONFIG_DEBUG_FS=y" >> kernel/oneplus/sm8150/arch/arm64/configs/vendor/sm8150-perf_defconfig; sed -i 's/^YYLTYPE yylloc;/extern YYLTYPE yylloc;/' kernel/*/*/scripts/dtc/dtc-lexer.l*; #Fix builds with GCC 10