From 0a664cc22cb36113548d72f1a9fe971489e84773 Mon Sep 17 00:00:00 2001 From: Tad Date: Thu, 3 Feb 2022 21:12:02 -0500 Subject: [PATCH] Update CVE patchers Signed-off-by: Tad --- .../LineageOS-18.1/android_device_lge_mako/0001-LTE.patch | 2 +- .../0001-Remove_Analytics.patch | 4 ++-- Patches/Linux | 2 +- Scripts/Common/Deblob.sh | 2 +- .../CVE_Patchers/android_kernel_oneplus_sm7250.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm6150.sh | 3 ++- .../CVE_Patchers/android_kernel_essential_msm8998.sh | 7 ++----- .../CVE_Patchers/android_kernel_google_coral.sh | 3 ++- .../CVE_Patchers/android_kernel_google_redbull.sh | 3 ++- .../CVE_Patchers/android_kernel_google_sunfish.sh | 3 ++- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 3 ++- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 3 ++- 14 files changed, 25 insertions(+), 19 deletions(-) diff --git a/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch b/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch index 93d6e9cd..f1e7c33c 100644 --- a/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch +++ b/Patches/LineageOS-18.1/android_device_lge_mako/0001-LTE.patch @@ -53,7 +53,7 @@ index 0000000..53c62dd + + diff --git a/system_prop.mk b/system_prop.mk -index 547da5f..e240393 100644 +index 224979b..7cb7fac 100644 --- a/system_prop.mk +++ b/system_prop.mk @@ -47,7 +47,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ diff --git a/Patches/LineageOS-18.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch b/Patches/LineageOS-18.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch index 8be675dc..ea436c9a 100644 --- a/Patches/LineageOS-18.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch +++ b/Patches/LineageOS-18.1/android_packages_apps_LineageParts/0001-Remove_Analytics.patch @@ -76,10 +76,10 @@ index 4236b27..eed044a 100644 true diff --git a/res/values/strings.xml b/res/values/strings.xml -index b0493d1..0351447 100644 +index 8fe201e..dc1015a 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml -@@ -527,28 +527,6 @@ +@@ -530,28 +530,6 @@ Total commits: %2$s

Last update: %3$s]]> diff --git a/Patches/Linux b/Patches/Linux index b44ae975..f219b0d6 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit b44ae9751a2dc53a368c25e89500a74eede36458 +Subproject commit f219b0d65706fb126c53d5cb4f827e726d31af97 diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index b66efea1..6030ba5e 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -67,7 +67,7 @@ echo "Deblobbing..."; blobs=$blobs"|bin[/]atd|drexe|log_serial_arm|at_distributor|connfwexe"; blobs=$blobs"|OBDM_Permissions.apk"; if [ "$DOS_DEBLOBBER_REMOVE_ATFWD" = true ]; then - blobs=$blobs"|ATFWD-daemon"; + blobs=$blobs"|ATFWD-daemon|atfwd_daemon"; blobs=$blobs"|vendor.qti.atcmdfwd.*|vendor.qti.hardware.radio.atcmdfwd.*"; blobs=$blobs"|atfwd.apk"; sepolicy=$sepolicy" atfwd.te"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 97d10012..c2398073 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -332,6 +332,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch @@ -424,5 +425,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p424" +editKernelLocalversion "-dos.p425" 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 79a5b8bc..092c11aa 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 @@ -394,6 +394,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -461,5 +462,5 @@ 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.p461" +editKernelLocalversion "-dos.p462" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index cd102a89..5ceacc42 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -141,6 +141,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -213,5 +214,5 @@ 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-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p213" +editKernelLocalversion "-dos.p214" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 51e50b3b..08a8c303 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -1,9 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/essential/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0295-0296.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0296-0297.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0298-0299.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0300-0301.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0301-0302.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0004.patch @@ -103,6 +101,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0936/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch -editKernelLocalversion "-dos.p104" +editKernelLocalversion "-dos.p101" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh index f1473359..e891f339 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh @@ -139,6 +139,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -210,5 +211,5 @@ 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-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p210" +editKernelLocalversion "-dos.p211" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh index 4b3545cd..051afbb0 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_redbull.sh @@ -135,6 +135,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch @@ -234,5 +235,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.19/0005.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p234" +editKernelLocalversion "-dos.p235" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh index 475aad43..9875e320 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh @@ -136,6 +136,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -207,5 +208,5 @@ 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-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p207" +editKernelLocalversion "-dos.p208" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 8ae69da1..f13ae966 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -195,6 +195,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -271,5 +272,5 @@ 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.p271" +editKernelLocalversion "-dos.p272" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index e2584e0f..6847f314 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -231,6 +231,7 @@ 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-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.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 @@ -307,5 +308,5 @@ 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.p307" +editKernelLocalversion "-dos.p308" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index 5b1c837e..e3c9f1ba 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -260,6 +260,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4135/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4149/^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4155/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4157/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4159/^5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4202/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch @@ -356,5 +357,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p356" +editKernelLocalversion "-dos.p357" cd "$DOS_BUILD_BASE"