diff --git a/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch b/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch index 307e4e71..891407a3 100644 --- a/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch +++ b/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0001-Hosts_Cache.patch @@ -1,7 +1,7 @@ -From 4a5a3831856e2031585911f480e7da39d8eacd4d Mon Sep 17 00:00:00 2001 +From 6332b25b8792a40e3800e7b502c0a97156caa7de Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Tue, 25 Aug 2020 08:31:32 -0700 -Subject: [PATCH] netd: Sort and cache hosts file data for fast lookup +Subject: [PATCH] DnsResolver: Sort and cache hosts file data for fast lookup The hosts file is normally searched linearly. This is very slow when the file is large. To mitigate this, read the hosts file and sort the @@ -119,8 +119,8 @@ index 0000000..91914d1 + +#define MAX_ADDRLEN (INET6_ADDRSTRLEN - (1 + 5)) +#define MAX_HOSTLEN MAXHOSTNAMELEN -+#define HCMAXALIASES 35 -+#define HCMAXADDRS 35 ++constexpr int MAXALIASES = 35; ++constexpr int MAXADDRS = 35; + +#define ESTIMATED_LINELEN 32 +#define HCFILE_ALLOC_SIZE 256 @@ -499,9 +499,9 @@ index 0000000..91914d1 + int cmp; + size_t addrlen; + unsigned int naliases = 0; -+ char *aliases[HCMAXALIASES]; ++ char *aliases[MAXALIASES]; + unsigned int naddrs = 0; -+ char *addr_ptrs[HCMAXADDRS]; ++ char *addr_ptrs[MAXADDRS]; + unsigned int n; + + if (getenv("ANDROID_HOSTS_CACHE_DISABLE") != NULL) @@ -548,7 +548,7 @@ index 0000000..91914d1 + hstrcpy(namestr, name); + HENT_SCOPY(aliases[naliases], namestr, info->buf, info->buflen); + ++naliases; -+ if (naliases >= HCMAXALIASES) ++ if (naliases >= MAXALIASES) + goto nospc; + } + aligned = (char *)ALIGN(info->buf); @@ -560,7 +560,7 @@ index 0000000..91914d1 + } + HENT_COPY(addr_ptrs[naddrs], addr, addrlen, info->buf, info->buflen); + ++naddrs; -+ if (naddrs >= HCMAXADDRS) ++ if (naddrs >= MAXADDRS) + goto nospc; + } + diff --git a/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0002-Wildcard_Hosts.patch b/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0002-Wildcard_Hosts.patch index 9e7acb57..30350a9e 100644 --- a/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0002-Wildcard_Hosts.patch +++ b/Patches/LineageOS-18.1/android_packages_modules_DnsResolver/0002-Wildcard_Hosts.patch @@ -1,7 +1,7 @@ From 25868038230a2d634a957b242a87168005cc13ab Mon Sep 17 00:00:00 2001 From: Tom Marshall Date: Thu, 16 Jan 2020 13:07:04 -0800 -Subject: [PATCH] netd: Support wildcards in cached hosts file +Subject: [PATCH] DnsResolver: Support wildcards in cached hosts file If an exact name is not found in the hosts file and the host name contains at least one dot, search for entries of the form "*.domain", @@ -51,7 +51,7 @@ index 91914d1..6d7dbd8 100644 + + ent = _hcfindname_exact(name); + if (!ent && strlen(name) < sizeof(namebuf)) { -+ strlcpy(namebuf, name, sizeof(name)); ++ strlcpy(namebuf, name, sizeof(namebuf)); + p = namebuf; + do { + dot = strchr(p, '.'); diff --git a/PrebuiltApps b/PrebuiltApps index 932cd181..338b5929 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 932cd1814de33fedcd7bb6f64c9cbaa3136b16f1 +Subproject commit 338b5929f1ca33c137743ac8452d44f34d040656 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index d24c3bd9..23edb7ce 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -28,8 +28,9 @@ commentPatches() { fi; } +commentPatches android_kernel_amazon_hdx-common.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_fugu.sh "CVE-2014-2568" "CVE-2014-8559" "CVE-2015-8746" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.patch"; -commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868"; +commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch" "CVE-2018-5897" "CVE-2018-9514" "CVE-2018-11266"; @@ -43,14 +44,14 @@ commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" " commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; -commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima"; +commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_google_redbull.sh "CVE-2018-5873" "CVE-2021-3444" "CVE-2021-3600"; commentPatches android_kernel_google_wahoo.sh "0008-Graphene-Kernel_Hardening/4.4/0019.patch" "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; commentPatches android_kernel_google_yellowstone.sh "0001-LinuxIncrementals/3.10/3.10.0098-0099.patch" "CVE-2018-9514"; commentPatches android_kernel_huawei_angler.sh "CVE-2014-8559"; commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514"; -commentPatches android_kernel_htc_msm8960.sh "CVE-2018-10876" "CVE-2021-0695"; +commentPatches android_kernel_htc_msm8960.sh "CVE-2018-10876" "CVE-2021-0695" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_htc_msm8974.sh "CVE-2016-8393"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166" "CVE-2018-3585" "CVE-2018-9514"; commentPatches android_kernel_lge_bullhead.sh "CVE-2014-8559"; @@ -68,7 +69,9 @@ commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600"; 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"; 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_exynos5420.sh "CVE-2021-Misc2/3.4/0061.patch" "CVE-2021-Misc2/3.4/0062.patch"; commentPatches android_kernel_samsung_jf.sh "CVE-2019-11599"; +commentPatches android_kernel_samsung_manta.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch"; commentPatches android_kernel_samsung_msm8930-common.sh "CVE-2017-11015/prima" "CVE-2019-11599"; commentPatches android_kernel_samsung_smdk4412.sh "CVE-2012-2127" "CVE-2016-8463/ANY/0001.patch"; commentPatches android_kernel_samsung_tuna.sh "CVE-2012-2127"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index b95a461c..b0604a18 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -652,8 +652,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0049.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0057.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0064.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 23c2dbb8..0e880620 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -321,8 +321,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh index 9528ba42..61cacb26 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh @@ -338,8 +338,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0014.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh index d6c059ab..6bee1ece 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_exynos5420.sh @@ -135,8 +135,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0071.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0072.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0073.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index a67e2276..6b02ed38 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -244,8 +244,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/^3.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0055.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0056.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0060.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0061.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/3.4/0062.patch diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index f3d67020..dec7e565 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -405,6 +405,11 @@ enableLowRam "device/samsung/tuna"; #Fixes #Fix broken options enabled by hardenDefconfig() sed -i "s/# CONFIG_KPROBES is not set/CONFIG_KPROBES=y/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/CONFIG_X509_CERTIFICATE_PARSER=y/# CONFIG_X509_CERTIFICATE_PARSER is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y/# ASYMMETRIC_PUBLIC_KEY_SUBTYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/SYSTEM_TRUSTED_KEYRING=y/# SYSTEM_TRUSTED_KEYRING is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/ASYMMETRIC_KEY_TYPE=y/# ASYMMETRIC_KEY_TYPE is not set/" kernel/amazon/hdx-common/arch/arm/configs/*hdx*_defconfig; #Breaks on compile +sed -i "s/CONFIG_DEBUG_RODATA=y/# CONFIG_DEBUG_RODATA is not set/" kernel/asus/grouper/arch/arm/configs/grouper_defconfig; #Breaks on compile awk -i inplace '!/STACKPROTECTOR/' kernel/lge/msm8992/arch/arm64/configs/lineageos_*_defconfig; #Breaks on compile sed -i "s/CONFIG_ARM_SMMU=y/# CONFIG_ARM_SMMU is not set/" kernel/motorola/msm8992/arch/arm64/configs/*defconfig; #Breaks on compile #tuna fixes diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index 22ea0240..d8ff8783 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -308,7 +308,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0026.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0028.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0029.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0030.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0031.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0031.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0032.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0033.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0034.patch