From d29b69b70d383746a03e61561837788d79651f28 Mon Sep 17 00:00:00 2001 From: Tavi Date: Wed, 24 Jan 2024 14:08:23 -0500 Subject: [PATCH] Churn Signed-off-by: Tavi --- .../android_kernel_oneplus_sm7250.sh | 81 ++----------------- Scripts/LineageOS-20.0/Patch.sh | 4 - 2 files changed, 5 insertions(+), 80 deletions(-) diff --git a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh index 119f15ee..e1789d19 100644 --- a/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh +++ b/Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm7250.sh @@ -1,7 +1,6 @@ #!/bin/bash if cd "$DOS_BUILD_BASE""kernel/oneplus/sm7250"; then git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-allocsize/4.19/0012.patch @@ -21,7 +20,6 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.19/0013.pa git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.19/0018.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.19/0021.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.19/0024.patch -git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-ro/4.19/0035.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-sanitize/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-sanitize/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-sanitize/4.19/0016.patch @@ -30,7 +28,7 @@ git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.19/0007. git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.19/0011.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.19/0015.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening-slab/4.19/0019.patch -git apply $DOS_PATCHES_LINUX_CVES/0009-rfc4941bis/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0009-rfc4941bis/ANY/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-7837/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5873/ANY/0001.patch @@ -69,99 +67,30 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3625/^5.19/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3903/^6.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4662/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4744/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20148/^5.15/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20571/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch -#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-42703/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45886/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45887/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-45919/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0030/^4.20/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0386/^6.2/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0590/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1077/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1118/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1206/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1281/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1380/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1670/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1855/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1859/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1990/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1998/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2002/3.10-^6.3/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2007/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2194/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2248/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2269/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2483/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-2985/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3090/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3117/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3141/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3212/4.19/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3220/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3609/4.19/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3772/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3776/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3777/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4128/4.19/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4128/4.19/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4128/4.19/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4132/4.6-^6.2/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4132/4.19/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4133/^6.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4134/^6.3/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4244/4.19/0025.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4622/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4194/^6.5/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4623/4.12-^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-4921/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6040/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6606/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6932/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-7192/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21656/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21665/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-21666/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23000/^5.16/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-23454/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-25775/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28553/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-28584/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30456/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-30772/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31083/^6.5/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31084/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-31085/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-32233/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-33106/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-33107/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-33114/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34256/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-34324/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35001/4.19/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35788/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35823/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35824/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-35828/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-39189/4.19/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-39192/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-39193/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-39194/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-40283/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-42752/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-42754/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-42755/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-45862/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-45863/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-45871/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51780/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51781/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-51782/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/^6.4/0001.patch -editKernelLocalversion "-dos.p161" +editKernelLocalversion "-dos.p90" else echo "kernel_oneplus_sm7250 is unavailable, not patching."; fi; cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-20.0/Patch.sh b/Scripts/LineageOS-20.0/Patch.sh index 5dfaa63e..f7c7eab6 100644 --- a/Scripts/LineageOS-20.0/Patch.sh +++ b/Scripts/LineageOS-20.0/Patch.sh @@ -544,10 +544,6 @@ if enterAndClear "kernel/fairphone/sdm632"; then sed -i 's|/../../prebuilts/tools-lineage|/../../../prebuilts/tools-lineage|' lib/Makefile; #fixup typo fi; -if enterAndClear "kernel/oneplus/sm7250"; then -git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29; -fi; - #if enterAndClear "kernel/oneplus/sm8250"; then #git revert --no-edit 6eede8c64f268991abe669a6123e929e295fac29; #fi;