diff --git a/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch b/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch index 719866e6..e6ea16a5 100644 --- a/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch +++ b/Patches/LineageOS-14.1/android_external_libnfc-nci/341071.patch @@ -1,4 +1,4 @@ -From 142a4f4670c6c3280ed56f8ae643b02b12f0030e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alisher Alikhodjaev Date: Tue, 2 Aug 2022 13:32:30 -0700 Subject: [PATCH] The length of a packet should be non-zero diff --git a/Patches/LineageOS-14.1/android_system_bt/341070.patch b/Patches/LineageOS-14.1/android_system_bt/341070.patch index b00a2517..9b7a6076 100644 --- a/Patches/LineageOS-14.1/android_system_bt/341070.patch +++ b/Patches/LineageOS-14.1/android_system_bt/341070.patch @@ -1,4 +1,4 @@ -From 3adbba6cba5251cb939612c21225f888c961d3c8 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Ted Wang Date: Fri, 1 Apr 2022 11:22:34 +0800 Subject: [PATCH] Fix potential interger overflow when parsing vendor response @@ -21,10 +21,10 @@ Signed-off-by: Vasyl Gello 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stack/avrc/avrc_pars_ct.c b/stack/avrc/avrc_pars_ct.c -index cff7bffbe9..88f83066e6 100644 +index 077ef1210..fc94424ba 100644 --- a/stack/avrc/avrc_pars_ct.c +++ b/stack/avrc/avrc_pars_ct.c -@@ -531,8 +531,12 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp( +@@ -541,8 +541,12 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp( BE_STREAM_TO_UINT32(p_attrs[i].attr_id, p); BE_STREAM_TO_UINT16(p_attrs[i].name.charset_id, p); BE_STREAM_TO_UINT16(p_attrs[i].name.str_len, p); @@ -39,7 +39,7 @@ index cff7bffbe9..88f83066e6 100644 { for (int j = 0; j < i; j++) { -@@ -542,6 +546,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp( +@@ -552,6 +556,7 @@ static tAVRC_STS avrc_ctrl_pars_vendor_rsp( p_result->get_attrs.num_attrs = 0; goto length_error; } diff --git a/Patches/LineageOS-19.1/android_libcore/0001-Network_Permission.patch b/Patches/LineageOS-19.1/android_libcore/0001-Network_Permission.patch index 8e8bf556..50459bd0 100644 --- a/Patches/LineageOS-19.1/android_libcore/0001-Network_Permission.patch +++ b/Patches/LineageOS-19.1/android_libcore/0001-Network_Permission.patch @@ -9,7 +9,7 @@ Subject: [PATCH] don't throw SecurityException when INTERNET permission is 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/ojluni/src/main/java/java/net/Inet6AddressImpl.java b/ojluni/src/main/java/java/net/Inet6AddressImpl.java -index 84bcf17edae..fda9674e08e 100644 +index 84bcf17eda..fda9674e08 100644 --- a/ojluni/src/main/java/java/net/Inet6AddressImpl.java +++ b/ojluni/src/main/java/java/net/Inet6AddressImpl.java @@ -141,16 +141,7 @@ class Inet6AddressImpl implements InetAddressImpl { diff --git a/Patches/LineageOS-19.1/android_libcore/0002-constify_JNINativeMethod.patch b/Patches/LineageOS-19.1/android_libcore/0002-constify_JNINativeMethod.patch index 6852442c..ccaa0500 100644 --- a/Patches/LineageOS-19.1/android_libcore/0002-constify_JNINativeMethod.patch +++ b/Patches/LineageOS-19.1/android_libcore/0002-constify_JNINativeMethod.patch @@ -20,7 +20,7 @@ Subject: [PATCH] constify JNINativeMethod tables 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/luni/src/main/native/android_system_OsConstants.cpp b/luni/src/main/native/android_system_OsConstants.cpp -index 50e3c104666..8ad66d2742b 100644 +index 50e3c10466..8ad66d2742 100644 --- a/luni/src/main/native/android_system_OsConstants.cpp +++ b/luni/src/main/native/android_system_OsConstants.cpp @@ -722,7 +722,7 @@ static void OsConstants_initConstants(JNIEnv* env, jclass c) { @@ -33,7 +33,7 @@ index 50e3c104666..8ad66d2742b 100644 }; void register_android_system_OsConstants(JNIEnv* env) { diff --git a/luni/src/main/native/java_lang_StringToReal.cpp b/luni/src/main/native/java_lang_StringToReal.cpp -index 7a492856394..edd71fad700 100644 +index 7a49285639..edd71fad70 100644 --- a/luni/src/main/native/java_lang_StringToReal.cpp +++ b/luni/src/main/native/java_lang_StringToReal.cpp @@ -892,7 +892,7 @@ static jdouble StringToReal_parseDblImpl(JNIEnv* env, jclass, jstring s, jint e) @@ -46,7 +46,7 @@ index 7a492856394..edd71fad700 100644 NATIVE_METHOD(StringToReal, parseDblImpl, "(Ljava/lang/String;I)D"), }; diff --git a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp -index 0441d4552dc..3335c6de9ac 100644 +index 0441d4552d..3335c6de9a 100644 --- a/luni/src/main/native/java_lang_invoke_MethodHandle.cpp +++ b/luni/src/main/native/java_lang_invoke_MethodHandle.cpp @@ -29,7 +29,7 @@ static jobject MethodHandle_invoke(JNIEnv* env, jobject, jobjectArray) { @@ -59,7 +59,7 @@ index 0441d4552dc..3335c6de9ac 100644 NATIVE_METHOD(MethodHandle, invoke, "([Ljava/lang/Object;)Ljava/lang/Object;"), }; diff --git a/luni/src/main/native/java_lang_invoke_VarHandle.cpp b/luni/src/main/native/java_lang_invoke_VarHandle.cpp -index e1cc1c7f8b5..9f5215a5204 100644 +index e1cc1c7f8b..9f5215a520 100644 --- a/luni/src/main/native/java_lang_invoke_VarHandle.cpp +++ b/luni/src/main/native/java_lang_invoke_VarHandle.cpp @@ -210,7 +210,7 @@ static jboolean VarHandle_weakCompareAndSetRelease(JNIEnv* env, jobject, jobject @@ -72,7 +72,7 @@ index e1cc1c7f8b5..9f5215a5204 100644 NATIVE_METHOD(VarHandle, compareAndExchangeAcquire, "([Ljava/lang/Object;)Ljava/lang/Object;"), NATIVE_METHOD(VarHandle, compareAndExchangeRelease, "([Ljava/lang/Object;)Ljava/lang/Object;"), diff --git a/luni/src/main/native/libcore_icu_ICU.cpp b/luni/src/main/native/libcore_icu_ICU.cpp -index f9401d1edb7..1531ad1ca59 100644 +index f9401d1edb..1531ad1ca5 100644 --- a/luni/src/main/native/libcore_icu_ICU.cpp +++ b/luni/src/main/native/libcore_icu_ICU.cpp @@ -112,7 +112,7 @@ static jstring ICU_getUnicodeVersion(JNIEnv* env, jclass) { @@ -85,7 +85,7 @@ index f9401d1edb7..1531ad1ca59 100644 NATIVE_METHOD(ICU, getCldrVersion, "()Ljava/lang/String;"), NATIVE_METHOD(ICU, getDefaultLocale, "()Ljava/lang/String;"), diff --git a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp -index e99edd6c4f9..61b75bcd358 100644 +index e99edd6c4f..61b75bcd35 100644 --- a/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp +++ b/luni/src/main/native/libcore_io_AsynchronousCloseMonitor.cpp @@ -26,7 +26,7 @@ static void AsynchronousCloseMonitor_signalBlockedThreads(JNIEnv* env, jclass, j @@ -98,7 +98,7 @@ index e99edd6c4f9..61b75bcd358 100644 }; void register_libcore_io_AsynchronousCloseMonitor(JNIEnv* env) { diff --git a/luni/src/main/native/libcore_io_Linux.cpp b/luni/src/main/native/libcore_io_Linux.cpp -index d7b6c22aa57..996085b1423 100755 +index d7b6c22aa5..996085b142 100755 --- a/luni/src/main/native/libcore_io_Linux.cpp +++ b/luni/src/main/native/libcore_io_Linux.cpp @@ -2741,7 +2741,7 @@ static jint Linux_writev(JNIEnv* env, jobject, jobject javaFd, jobjectArray buff @@ -111,7 +111,7 @@ index d7b6c22aa57..996085b1423 100755 NATIVE_METHOD(Linux, access, "(Ljava/lang/String;I)Z"), NATIVE_METHOD(Linux, android_fdsan_exchange_owner_tag, "(Ljava/io/FileDescriptor;JJ)V"), diff --git a/luni/src/main/native/libcore_io_Memory.cpp b/luni/src/main/native/libcore_io_Memory.cpp -index b8a88450006..7dec85dab80 100644 +index b8a8845000..7dec85dab8 100644 --- a/luni/src/main/native/libcore_io_Memory.cpp +++ b/luni/src/main/native/libcore_io_Memory.cpp @@ -290,7 +290,7 @@ static void Memory_unsafeBulkPut(JNIEnv* env, jclass, jbyteArray dstArray, jint @@ -124,7 +124,7 @@ index b8a88450006..7dec85dab80 100644 FAST_NATIVE_METHOD(Memory, peekByte, "(J)B"), NATIVE_METHOD(Memory, peekByteArray, "(J[BII)V"), diff --git a/luni/src/main/native/libcore_math_NativeBN.cpp b/luni/src/main/native/libcore_math_NativeBN.cpp -index dc4b947358b..c6af376f6bc 100644 +index dc4b947358..c6af376f6b 100644 --- a/luni/src/main/native/libcore_math_NativeBN.cpp +++ b/luni/src/main/native/libcore_math_NativeBN.cpp @@ -164,7 +164,7 @@ static void NativeBN_BN_mod_exp(JNIEnv* env, jclass, jlong r, jlong a, jlong p, @@ -137,7 +137,7 @@ index dc4b947358b..c6af376f6bc 100644 NATIVE_METHOD(NativeBN, BN_free, "(J)V"), NATIVE_METHOD(NativeBN, BN_mod_exp, "(JJJJ)V"), diff --git a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp -index ded578a9580..faaa5c7a7c4 100644 +index ded578a958..faaa5c7a7c 100644 --- a/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp +++ b/luni/src/main/native/libcore_util_NativeAllocationRegistry.cpp @@ -29,7 +29,7 @@ static void NativeAllocationRegistry_applyFreeFunction(JNIEnv*, @@ -150,7 +150,7 @@ index ded578a9580..faaa5c7a7c4 100644 }; diff --git a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp -index fdabcf71591..62a2cd37b76 100644 +index fdabcf7159..62a2cd37b7 100644 --- a/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp +++ b/luni/src/main/native/org_apache_harmony_xml_ExpatParser.cpp @@ -1366,7 +1366,7 @@ static void ExpatParser_staticInitialize(JNIEnv* env, jobject classObject, jstri @@ -172,7 +172,7 @@ index fdabcf71591..62a2cd37b76 100644 NATIVE_METHOD(ExpatAttributes, getIndexForQName, "(JLjava/lang/String;)I"), NATIVE_METHOD(ExpatAttributes, getIndex, "(JLjava/lang/String;Ljava/lang/String;)I"), diff --git a/luni/src/main/native/sun_misc_Unsafe.cpp b/luni/src/main/native/sun_misc_Unsafe.cpp -index 49848a2db2b..87b2feac807 100644 +index 49848a2db2..87b2feac80 100644 --- a/luni/src/main/native/sun_misc_Unsafe.cpp +++ b/luni/src/main/native/sun_misc_Unsafe.cpp @@ -23,7 +23,7 @@ static jobject Unsafe_allocateInstance(JNIEnv* env, jclass, jclass c) { @@ -185,7 +185,7 @@ index 49848a2db2b..87b2feac807 100644 }; void register_sun_misc_Unsafe(JNIEnv* env) { diff --git a/ojluni/src/main/native/Character.cpp b/ojluni/src/main/native/Character.cpp -index 3e27c674d2f..719190c81ae 100644 +index 3e27c674d2..719190c81a 100644 --- a/ojluni/src/main/native/Character.cpp +++ b/ojluni/src/main/native/Character.cpp @@ -158,7 +158,7 @@ Character_getNameImpl(JNIEnv* env, jclass, jint codePoint) { diff --git a/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-1.patch b/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-1.patch index 2a526798..207cb0fb 100644 --- a/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-1.patch +++ b/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-1.patch @@ -11,7 +11,7 @@ Subject: [PATCH] add parameter for avoiding full preload with exec 4 files changed, 30 insertions(+), 2 deletions(-) diff --git a/api/module-lib-current.txt b/api/module-lib-current.txt -index 15741a78057..e554dd77cb8 100644 +index 15741a7805..e554dd77cb 100644 --- a/api/module-lib-current.txt +++ b/api/module-lib-current.txt @@ -366,7 +366,9 @@ package dalvik.system { @@ -25,7 +25,7 @@ index 15741a78057..e554dd77cb8 100644 method public static void postForkChild(int, boolean, boolean, String); method public static void postForkCommon(); diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java -index a17a2574f7b..763511d2187 100644 +index a17a2574f7..763511d218 100644 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java @@ -62,7 +62,7 @@ public final class ZygoteHooks { @@ -83,7 +83,7 @@ index a17a2574f7b..763511d2187 100644 * Runs several special GCs to try to clean up a few generations of * softly- and final-reachable objects, along with any other garbage. diff --git a/mmodules/core_platform_api/api/legacy_platform/current.txt b/mmodules/core_platform_api/api/legacy_platform/current.txt -index 15741a78057..e554dd77cb8 100644 +index 15741a7805..e554dd77cb 100644 --- a/mmodules/core_platform_api/api/legacy_platform/current.txt +++ b/mmodules/core_platform_api/api/legacy_platform/current.txt @@ -366,7 +366,9 @@ package dalvik.system { @@ -97,7 +97,7 @@ index 15741a78057..e554dd77cb8 100644 method public static void postForkChild(int, boolean, boolean, String); method public static void postForkCommon(); diff --git a/mmodules/core_platform_api/api/stable_platform/current.txt b/mmodules/core_platform_api/api/stable_platform/current.txt -index 15741a78057..e554dd77cb8 100644 +index 15741a7805..e554dd77cb 100644 --- a/mmodules/core_platform_api/api/stable_platform/current.txt +++ b/mmodules/core_platform_api/api/stable_platform/current.txt @@ -366,7 +366,9 @@ package dalvik.system { diff --git a/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-2.patch b/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-2.patch index 31f46ac4..334a3702 100644 --- a/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-2.patch +++ b/Patches/LineageOS-19.1/android_libcore/0003-Exec_Based_Spawning-2.patch @@ -8,7 +8,7 @@ Subject: [PATCH] disable ICU cache pinning for exec spawning 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java -index 763511d2187..179c19ac8d5 100644 +index 763511d218..179c19ac8d 100644 --- a/dalvik/src/main/java/dalvik/system/ZygoteHooks.java +++ b/dalvik/src/main/java/dalvik/system/ZygoteHooks.java @@ -63,9 +63,11 @@ public final class ZygoteHooks { diff --git a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 377f13a9..0cdc4d04 100644 --- a/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -1,9 +1,8 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/sm8150" +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0181-0182.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0201-0202.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.0207-0208.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0210-0211.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/0001-LinuxIncrementals/4.14/4.14.0261-0262.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.14/4.14.0263-0264.patch --exclude=Makefile @@ -28,7 +27,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0069.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0070.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0071.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0072.patch -git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0073.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0074.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0075.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.14/0076.patch @@ -59,8 +57,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11191/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12378/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12455/^5.1.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14034/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14099/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16921/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-18808/4.14/0003.patch @@ -72,28 +68,56 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19073/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19074/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19448/4.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19462/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19602/^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19947/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0423/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0433/4.14/0010.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-0543/4.14/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0543/4.14/0013.patch +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/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 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10768/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-10781/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11240/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12655/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12656/4.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12770/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12771/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13143/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-13974/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14314/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14331/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14351/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14356/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14390/4.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15393/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15437/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15780/^5.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.14/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.14/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/4.14/0002.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24588/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24588/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.14/0004.patch @@ -105,6 +129,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25641/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25643/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25645/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25668/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25669/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25670/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25671/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25672/4.14/0002.patch @@ -139,13 +164,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29568/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29569/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29661/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35508/4.14/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-35519/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36158/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36312/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-36516/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-BleedingToothExtras/^5.10/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0512/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0605/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0606/4.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0004.patch @@ -158,7 +183,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0937/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0961/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1048/4.1-^5.9/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1927/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1904/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1940/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1961/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1962/ANY/0001.patch @@ -166,9 +191,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1968/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1969/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1980/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3348/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0009.patch @@ -180,9 +203,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/^5.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/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.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 @@ -201,17 +221,18 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3772/4.14/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3894/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3896/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0016.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0017.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4197/4.14/0018.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20320/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20321/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-22600/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26401/^5.17/0002.patch @@ -245,7 +266,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30334/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -257,10 +277,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33656/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34981/^5.13/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35069/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35084/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35085/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35088/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35105/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35118/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35119/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn @@ -273,12 +291,8 @@ 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-2021-38300/4.14/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39633/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39634/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39648/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39656/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39711/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39714/4.14/0009.patch @@ -291,20 +305,17 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-44733/4.14/0004.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45868/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0494/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0617/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0644/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0812/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0847/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0850/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1011/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1012/4.14/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1016/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/4.14/0004.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1184/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1198/4.14/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-1280/^5.13/0002.patch @@ -325,14 +336,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2318/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2380/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2588/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2639/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2964/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-2991/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3028/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3239/4.14/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20009/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20141/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20154/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch @@ -341,12 +348,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20368/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20421/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20422/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-23039/^5.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24448/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24958/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-24959/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25664/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-25666/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-26966/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27223/4.14/0002.patch @@ -369,6 +374,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-40307/4.14/0002.patch 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.p370" +editKernelLocalversion "-dos.p374" cd "$DOS_BUILD_BASE" diff --git a/Scripts/WebView_Update_Repo.sh b/Scripts/WebView_Update_Repo.sh index d397d6f8..3d0c1cc4 100644 --- a/Scripts/WebView_Update_Repo.sh +++ b/Scripts/WebView_Update_Repo.sh @@ -16,7 +16,7 @@ umask 0022; set -uo pipefail; -export version="106.0.5249.79-1"; +export version="106.0.5249.118-1"; export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0; export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk"; export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk"; diff --git a/Scripts/init.sh b/Scripts/init.sh index 0db67782..1015687e 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -43,8 +43,8 @@ export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of externa export DOS_DEBLOBBER_REMOVE_ATFWD=true; #Set true to remove basic ATFWD blobs export DOS_DEBLOBBER_REMOVE_AUDIOFX=true; #Set true to remove AudioFX export DOS_DEBLOBBER_REMOVE_APTX=true; #Set true to remove aptX Bluetooth codec -export DOS_DEBLOBBER_REMOVE_CNE=false; #Set true to remove all CNE blobs #XXX: Breaks Wi-Fi calling -export DOS_DEBLOBBER_REMOVE_DPM=false; #Set true to remove all DPM blobs #XXX: Breaks multi-sim and link aggregation (LTE+) +export DOS_DEBLOBBER_REMOVE_CNE=true; #Set true to remove all CNE blobs #XXX: Breaks Wi-Fi calling +export DOS_DEBLOBBER_REMOVE_DPM=true; #Set true to remove all DPM blobs #XXX: Breaks multi-sim and link aggregation (LTE+) export DOS_DEBLOBBER_REMOVE_DPP=false; #Set true to remove all Display Post Processing blobs #XXX: Breaks boot on select devices export DOS_DEBLOBBER_REMOVE_FP=false; #Set true to remove all fingerprint reader blobs export DOS_DEBLOBBER_REMOVE_GRAPHICS=false; #Set true to remove all graphics blobs and use SwiftShader CPU renderer #TODO: Needs work