From 6c38ece551640b5512372ab4c5bed80b0fd555d1 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 15 Dec 2021 15:33:58 -0500 Subject: [PATCH] Update CVE patchers User report confirms fixing wifi on lmi Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_fxtec_msm8998.sh | 3 +-- .../CVE_Patchers/android_kernel_oneplus_sm8150.sh | 4 +--- .../CVE_Patchers/android_kernel_xiaomi_sdm845.sh | 4 +--- .../CVE_Patchers/android_kernel_xiaomi_sm8150.sh | 4 +--- .../CVE_Patchers/android_kernel_xiaomi_sm8250.sh | 4 +--- 6 files changed, 6 insertions(+), 15 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index 073130ec..842004cd 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 073130ec254154e2f5d983ce582c257a0ac1c70d +Subproject commit 842004cdde191e89d3083ef53f8dd4b308b8cd34 diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index a4c8724e..b23f60c1 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -1,6 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/fxtec/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0291-0292.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/0006.patch #git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.4/0011.patch @@ -48,5 +47,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.4/0007.patch -editKernelLocalversion "-dos.p48" +editKernelLocalversion "-dos.p47" 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 fbfd09bb..d2e51cc0 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 @@ -93,7 +93,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-15780/^5.7.7/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-24587/qca-wifi-host-cmn/0015.patch --directory=drivers/staging/qca-wifi-host-cmn #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 @@ -113,7 +112,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25704/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qca-wifi-host-cmn/0009.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26146/qca-wifi-host-cmn/0003.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.14/0002.patch @@ -252,5 +250,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.p252" +editKernelLocalversion "-dos.p250" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 17ad3662..6bed4592 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -63,8 +63,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.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 -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3640/4.9/0012.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-4002/4.9/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch -editKernelLocalversion "-dos.p66" +editKernelLocalversion "-dos.p64" 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 7f5d1ec6..e239f29d 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 @@ -117,7 +117,6 @@ 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/^5.7.8/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0015.patch --directory=drivers/staging/qca-wifi-host-cmn #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 @@ -138,7 +137,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25704/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qca-wifi-host-cmn/0009.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26146/qca-wifi-host-cmn/0003.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.14/0002.patch @@ -286,5 +284,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.p286" +editKernelLocalversion "-dos.p284" 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 39d3dfc8..0066fc8e 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 @@ -143,7 +143,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16120/^5.7/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24394/^5.7.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24490/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24587/qca-wifi-host-cmn/0015.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24588/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24588/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25211/4.19/0005.patch @@ -164,7 +163,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25704/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-25705/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26088/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26139/qca-wifi-host-cmn/0016.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qca-wifi-host-cmn/0009.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26146/qca-wifi-host-cmn/0003.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/4.19/0003.patch @@ -336,5 +334,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.p336" +editKernelLocalversion "-dos.p334" cd "$DOS_BUILD_BASE"