From e9f58cfd3ca6d992a734f376e5fae0d544bb5de1 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 12 Feb 2023 20:29:41 -0500 Subject: [PATCH] VPN fixes Some devices still don't have these in 2023 https://gitlab.com/LineageOS/issues/android/-/issues/2193 Note, the following still aren't patched: 15.1 kernel/google/msm kernel/lge/hammerhead 16.0 kernel/cyanogen/msm8974 kernel/lge/hammerhead 18.1 kernel/motorola/msm8974 Signed-off-by: Tad --- Patches/Linux | 2 +- .../CVE_Patchers/android_kernel_motorola_msm8992.sh | 4 +++- .../CVE_Patchers/android_kernel_oneplus_msm8994.sh | 4 +++- .../LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh | 3 ++- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Patches/Linux b/Patches/Linux index fe4a8517..5d411c40 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit fe4a8517f47f5f341bdd97128643e24ef718ee30 +Subproject commit 5d411c4057ecabb24fac5aabaecee27a29d37ae7 diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index 49699006..11f9ffa7 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/motorola/msm8992" git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0004-No_dir-relax.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0005.patch @@ -75,6 +76,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17741/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/3.18/0003.patch @@ -412,5 +414,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch -editKernelLocalversion "-dos.p412" +editKernelLocalversion "-dos.p414" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh index 191e89bf..fc1ea5ce 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8994.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8994" git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.10/0002-alt1.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0004-No_dir-relax.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0005.patch @@ -78,6 +79,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16994/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17450/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17712/3.10/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17741/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-17805/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18079/3.18/0003.patch @@ -414,5 +416,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch -editKernelLocalversion "-dos.p414" +editKernelLocalversion "-dos.p416" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh index e996131d..20663aec 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm.sh @@ -1,6 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm" git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes-uid/3.4/0001-alt1.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0006-AndroidHardening-Kernel_Hardening/3.10/0007.patch @@ -412,5 +413,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/kernel.msm.git-7be3e08d7a5232 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch -editKernelLocalversion "-dos.p412" +editKernelLocalversion "-dos.p413" cd "$DOS_BUILD_BASE"