diff --git a/Patches/Linux b/Patches/Linux index dcb68207..a3e45d37 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit dcb68207fc434c66304b4e851b4c2c740a5e2123 +Subproject commit a3e45d3724aecae698bad544f868a335a13d24fe diff --git a/PrebuiltApps b/PrebuiltApps index 0e9affd5..932cd181 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit 0e9affd5e659ac20c6bef6a701b9e74bd1bd6463 +Subproject commit 932cd1814de33fedcd7bb6f64c9cbaa3136b16f1 diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh index 65fcb587..391d1d22 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_universal8890.sh @@ -614,7 +614,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh index 491956fe..2263100c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -572,7 +572,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index d9765271..7199b331 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -464,7 +464,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 5dca25d3..8aa6f3ae 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -561,7 +561,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh index 4bec2f7d..c354e90c 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_asus_msm8953.sh @@ -313,7 +313,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh index 00ee25a3..9312c4a8 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -380,7 +380,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index e03effb9..ff351dd0 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -257,8 +257,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/4.9/0006.patch @@ -306,5 +308,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p306" +editKernelLocalversion "-dos.p308" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 50f0f96d..f3b63b53 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -475,7 +475,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch 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 3e685406..cb0ed34c 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 @@ -298,8 +298,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3635/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/4.19/0004.patch @@ -307,6 +308,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch @@ -364,5 +366,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.p364" +editKernelLocalversion "-dos.p366" 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 babd0e7f..e407411a 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 @@ -366,7 +366,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 @@ -374,6 +374,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -416,5 +417,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.p416" +editKernelLocalversion "-dos.p417" 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 97deed58..61383a78 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 @@ -108,14 +108,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.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/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -160,5 +161,5 @@ 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-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p160" +editKernelLocalversion "-dos.p161" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh index f1d03887..d673d180 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -236,7 +236,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh index d02f147a..4e139969 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_zuk_msm8996.sh @@ -241,7 +241,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.4/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.4/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.4/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.4/0004.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 21dea046..23fe2b1c 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -218,8 +218,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch @@ -274,5 +276,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc2/ANY/0043.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p274" +editKernelLocalversion "-dos.p276" 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 431e5373..0196f719 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 @@ -106,14 +106,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.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/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -158,5 +159,5 @@ 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-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p158" +editKernelLocalversion "-dos.p159" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 79b3895e..3e1e7986 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -117,8 +117,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch @@ -163,5 +165,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38208/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p163" +editKernelLocalversion "-dos.p165" 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 adddcc46..45cf79b0 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 @@ -101,14 +101,16 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch @@ -174,5 +176,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-Misc/^5.13/0001.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.p174" +editKernelLocalversion "-dos.p176" 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 d8eba7ca..537068ad 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 @@ -107,14 +107,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.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/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -159,5 +160,5 @@ 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-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p159" +editKernelLocalversion "-dos.p160" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh index f00e2ab9..43c87e58 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -452,7 +452,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index c5072590..8e777774 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -372,7 +372,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3564/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/3.18/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/3.18/0001.patch diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh index c84d55f2..2d2acca1 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8998.sh @@ -1,7 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8998" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0281-0282.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0282-0283.patch --exclude=Makefile +git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.4/4.4.0284-0285.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 @@ -45,20 +44,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0026.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0027.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0028.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0029.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.4/0030.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11160/4.4/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/4.4/0006.patch 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/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1941/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1945/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p60" +editKernelLocalversion "-dos.p51" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 220ffabf..849725d2 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -176,8 +176,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0012.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3659/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.9/0005.patch @@ -223,5 +225,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38209/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p223" +editKernelLocalversion "-dos.p225" 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 6acb57ca..0d85ca31 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 @@ -164,14 +164,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.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/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -219,5 +220,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.p219" +editKernelLocalversion "-dos.p220" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh index 15146dd9..16f96b64 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_sdm845.sh @@ -69,7 +69,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/4.9/0007.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-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0014.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p71" +editKernelLocalversion "-dos.p73" 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 bf8c8732..b1ce8c79 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 @@ -1,9 +1,5 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/xiaomi/sdm845" -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0276-0277.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0277-0278.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0278-0279.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/4.9/4.9.0279-0280.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0024.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0025.patch git apply $DOS_PATCHES_LINUX_CVES/0008-Graphene-Kernel_Hardening/4.9/0026.patch @@ -62,20 +58,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20908/^5.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3674/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.9/0031.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.9/0032.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.9/0033.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.9/0034.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3702/4.9/0035.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11146/ANY/0001.patch 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/4.9/0007.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-3653/4.9/0007.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch -editKernelLocalversion "-dos.p77" +editKernelLocalversion "-dos.p63" 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 883af20e..3ba6ece2 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 @@ -198,14 +198,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.14/0002.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/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.14/0012.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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch @@ -253,5 +254,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.p253" +editKernelLocalversion "-dos.p254" 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 87be2106..2756fbe9 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 @@ -224,9 +224,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3573/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3609/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3612/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3653/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/^5.13/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3655/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3656/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3679/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3715/4.19/0004.patch @@ -234,6 +235,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3732/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3753/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20177/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20292/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20317/^5.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-21781/4.14-^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-22555/4.19/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch @@ -293,5 +295,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.p293" +editKernelLocalversion "-dos.p295" cd "$DOS_BUILD_BASE" diff --git a/Scripts/init.sh b/Scripts/init.sh index 2354c474..ceb33c47 100644 --- a/Scripts/init.sh +++ b/Scripts/init.sh @@ -61,8 +61,7 @@ export DOS_MICROG_INCLUDED="NLP"; #Determines inclusion of microG. Options: NLP, export DOS_NON_COMMERCIAL_USE_PATCHES=false; #Set true to allow inclusion of non-commercial use patches XXX: Unused, see 1dc9247 export DOS_OPTIMIZE_IMAGES=false; #Set true to apply lossless optimizations to image resources export DOS_STRONG_ENCRYPTION_ENABLED=false; #Set true to enable AES 256-bit FDE encryption on 14.1+15.1 XXX: THIS WILL **DESTROY** EXISTING INSTALLS! -alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/84/316084/1'; -#alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/63/316563/2'; +alias DOS_WEBVIEW_CHERRYPICK='git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/00/316600/2'; #Servers export DOS_DEFAULT_DNS_PRESET="Quad9"; #Sets default DNS. Options: See changeDefaultDNS() in Scripts/Common/Functions.sh