diff --git a/Patches/Linux b/Patches/Linux index e1a7a887..c91ae1e7 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit e1a7a8876204dbbb5ecd6b0745e7566b89799093 +Subproject commit c91ae1e7e7bd1cb6b86784023af8fbe0caeda57a diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 8109d779..b74a0134 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -677,7 +677,7 @@ hardenDefconfig() { done #Disable supported options #Disabled: MSM_SMP2P_TEST, MAGIC_SYSRQ (breaks compile), KALLSYMS (breaks boot on select devices), IKCONFIG (breaks recovery), MSM_DLOAD_MODE (breaks compile) - declare -a optionsNo=("ACPI_APEI_EINJ" "ACPI_CUSTOM_METHOD" "ACPI_TABLE_UPGRADE" "BINFMT_AOUT" "BINFMT_MISC" "BT_HS" "CHECKPOINT_RESTORE" "COMPAT_BRK" "COMPAT_VDSO" "CP_ACCESS64" "DEBUG_KMEMLEAK" "DEVKMEM" "DEVMEM" "DEVPORT" "EARJACK_DEBUGGER" "GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "HARDENED_USERCOPY_FALLBACK" "HIBERNATION" "HWPOISON_INJECT" "IA32_EMULATION" "IOMMU_NON_SECURE" "INPUT_EVBUG" "IP_DCCP" "IP_SCTP" "KEXEC" "KEXEC_FILE" "KSM" "LDISC_AUTOLOAD" "LEGACY_PTYS" "LIVEPATCH" "MEM_SOFT_DIRTY" "MMIOTRACE" "MMIOTRACE_TEST" "MODIFY_LDT_SYSCALL" "MSM_BUSPM_DEV" "NEEDS_SYSCALL_FOR_CMPXCHG" "NOTIFIER_ERROR_INJECTION" "OABI_COMPAT" "PAGE_OWNER" "PROC_KCORE" "PROC_PAGE_MONITOR" "PROC_VMCORE" "RDS" "RDS_TCP" "SECURITY_SELINUX_DISABLE" "SECURITY_WRITABLE_HOOKS" "SLAB_MERGE_DEFAULT" "STACKLEAK_METRICS" "STACKLEAK_RUNTIME_DISABLE" "TIMER_STATS" "TSC" "TSPP2" "UKSM" "UPROBES" "USELIB" "USERFAULTFD" "VIDEO_VIVID" "WLAN_FEATURE_MEMDUMP" "X86_IOPL_IOPERM" "X86_PTDUMP" "X86_VSYSCALL_EMULATION" "ZSMALLOC_STAT"); + declare -a optionsNo=("ACPI_APEI_EINJ" "ACPI_CUSTOM_METHOD" "ACPI_TABLE_UPGRADE" "BINFMT_AOUT" "BINFMT_MISC" "BT_HS" "CHECKPOINT_RESTORE" "COMPAT_BRK" "COMPAT_VDSO" "CP_ACCESS64" "DEBUG_KMEMLEAK" "DEVKMEM" "DEVMEM" "DEVPORT" "EARJACK_DEBUGGER" "GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "HARDENED_USERCOPY_FALLBACK" "HIBERNATION" "HWPOISON_INJECT" "IA32_EMULATION" "IOMMU_NON_SECURE" "INPUT_EVBUG" "IO_URING" "IP_DCCP" "IP_SCTP" "KEXEC" "KEXEC_FILE" "KSM" "LDISC_AUTOLOAD" "LEGACY_PTYS" "LIVEPATCH" "MEM_SOFT_DIRTY" "MMIOTRACE" "MMIOTRACE_TEST" "MODIFY_LDT_SYSCALL" "MSM_BUSPM_DEV" "NEEDS_SYSCALL_FOR_CMPXCHG" "NOTIFIER_ERROR_INJECTION" "OABI_COMPAT" "PAGE_OWNER" "PROC_KCORE" "PROC_PAGE_MONITOR" "PROC_VMCORE" "RDS" "RDS_TCP" "SECURITY_SELINUX_DISABLE" "SECURITY_WRITABLE_HOOKS" "SLAB_MERGE_DEFAULT" "STACKLEAK_METRICS" "STACKLEAK_RUNTIME_DISABLE" "TIMER_STATS" "TSC" "TSPP2" "UKSM" "UPROBES" "USELIB" "USERFAULTFD" "VIDEO_VIVID" "WLAN_FEATURE_MEMDUMP" "X86_IOPL_IOPERM" "X86_PTDUMP" "X86_VSYSCALL_EMULATION" "ZSMALLOC_STAT"); #if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]] && [[ "$1" != *"msm899"* ]] && [[ "$1" != *"sdm8"* ]] && [[ "$1" != *"sdm6"* ]]; then #optionsNo+=("DIAG_CHAR" "DIAG_OVER_USB" "USB_QCOM_DIAG_BRIDGE" "DIAGFWD_BRIDGE_CODE" "DIAG_SDIO_PIPE" "DIAG_HSIC_PIPE"); #fi; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh index e169a7ca..e6f928cb 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -601,6 +601,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -620,5 +621,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p620" +editKernelLocalversion "-dos.p621" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index 0f022cf4..a0727fc7 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -682,6 +682,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -704,5 +705,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p704" +editKernelLocalversion "-dos.p705" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 33004d59..d4213fa6 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -598,6 +598,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -617,5 +618,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p617" +editKernelLocalversion "-dos.p618" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 196f919c..49ff3d83 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -664,6 +664,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -687,5 +688,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p687" +editKernelLocalversion "-dos.p688" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index ca083300..7862692b 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -542,6 +542,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -560,5 +561,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p560" +editKernelLocalversion "-dos.p561" 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 201aef81..e594e74b 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 @@ -590,6 +590,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -606,5 +607,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p606" +editKernelLocalversion "-dos.p607" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 00bfe060..3eaadec4 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -637,6 +637,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -656,5 +657,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p656" +editKernelLocalversion "-dos.p657" 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 f2c7fd36..5895ed19 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 @@ -544,6 +544,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -563,5 +564,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p563" +editKernelLocalversion "-dos.p564" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index 3b08556e..2db3b661 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -483,6 +483,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -499,5 +500,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p499" +editKernelLocalversion "-dos.p500" 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 2716eb1b..5e38ccf7 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 @@ -366,6 +366,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -427,6 +428,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -439,5 +441,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p439" +editKernelLocalversion "-dos.p441" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 6feb9d81..f738999c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -465,6 +465,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -524,6 +525,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -536,5 +538,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p536" +editKernelLocalversion "-dos.p538" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 2a9c696c..3cce3687 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -405,6 +405,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -465,6 +466,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -478,5 +480,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p478" +editKernelLocalversion "-dos.p480" 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 5a850fe7..38d01492 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 @@ -433,6 +433,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -493,6 +494,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -506,5 +508,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p506" +editKernelLocalversion "-dos.p508" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 9c436caa..2fb3c015 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -116,8 +116,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/lineage"; fi; source build/envsetup.sh; - repopick -it tzdb2020f_O; - repopick -it tzdb2021a_O; repopick -it O_asb_2021-02; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh index add61b72..c57e0d3c 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh @@ -202,6 +202,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -266,6 +267,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27675/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -278,5 +280,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p278" +editKernelLocalversion "-dos.p280" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh index 5c368aa5..1ab7abe5 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-16.0/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.0256-0257.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -98,5 +99,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p98" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh index fb0b3eb1..95785612 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh @@ -278,6 +278,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -341,6 +342,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27675/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -356,5 +358,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p356" +editKernelLocalversion "-dos.p358" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh index 41bf4ac4..cb9139dc 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -323,6 +323,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -385,6 +386,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -397,5 +399,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p397" +editKernelLocalversion "-dos.p399" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 2b8930b4..7761166d 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -320,6 +320,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -384,6 +385,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -397,5 +399,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p397" +editKernelLocalversion "-dos.p399" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 349ad8ba..ece271a0 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -3,6 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/sm8150" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0126-0127.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0130-0131.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0205-0206.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0051.patch @@ -412,5 +413,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.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.p412" +editKernelLocalversion "-dos.p413" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index fa17076d..8997ccf0 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -132,10 +132,8 @@ export -f buildAll; 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/lineage"; fi; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it pie-firewall; - repopick -it tzdb2020f_P; - repopick -it tzdb2021a_P; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 5c368aa5..1ab7abe5 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-17.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.0256-0257.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -98,5 +99,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p98" +editKernelLocalversion "-dos.p99" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index 3a4a2810..e1d5d045 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0256-0257.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -49,5 +50,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p49" +editKernelLocalversion "-dos.p50" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh index 401e784f..67c0bfb0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_coral.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/coral" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0205-0206.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0051.patch @@ -181,5 +182,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-UNKNOWN/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.14/0002.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.p181" +editKernelLocalversion "-dos.p182" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index 1e1dad53..397904c7 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -266,6 +266,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -328,6 +329,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27675/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -343,5 +345,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p343" +editKernelLocalversion "-dos.p345" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 874c1929..efde5cbc 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -420,6 +420,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -432,5 +433,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p432" +editKernelLocalversion "-dos.p433" 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 41bf4ac4..cb9139dc 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 @@ -323,6 +323,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/3.18/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch @@ -385,6 +386,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -397,5 +399,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p397" +editKernelLocalversion "-dos.p399" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 8cc98c5f..7a3da788 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -333,6 +333,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27067/3.18/0027.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27068/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27675/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27815/3.18/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27825/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28915/3.18/0003.patch @@ -345,5 +346,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p345" +editKernelLocalversion "-dos.p346" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index 665b7fa8..e4245e8e 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -2,6 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" 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.0252-0253.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0256-0257.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch @@ -55,5 +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-2020-27825/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.4/0007.patch -editKernelLocalversion "-dos.p55" +editKernelLocalversion "-dos.p56" 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 c586dbd3..e19747d6 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 @@ -4,6 +4,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0126-0127.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0130-0131.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0137-0138.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0205-0206.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0219-0220.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0051.patch @@ -335,5 +336,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.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.p335" +editKernelLocalversion "-dos.p336" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index e0d2c7ba..57d97d7b 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0256-0257.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0016.patch git apply $DOS_PATCHES_LINUX_CVES/0007-Accelerated_AES/3.10+/0020.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -61,5 +62,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p61" +editKernelLocalversion "-dos.p62" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 857707fd..3761a619 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -130,10 +130,8 @@ export -f buildAll; 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/lineage"; fi; - source build/envsetup.sh; + #source build/envsetup.sh; #repopick -it ten-firewall; - repopick -it tzdb2020f_Q; - repopick -it tzdb2021a_Q; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";