diff --git a/Patches/Linux b/Patches/Linux index 9a38182e..24b2d044 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 9a38182e0ad2ab9597381c06fba43e107a0a0386 +Subproject commit 24b2d044fa4986523ea65522ceb3bd7ca6368633 diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 44853bbc..8b66dd7e 100644 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -70,7 +70,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqba patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/11/310811/1; #update webview enterAndClear "external/sqlite"; patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (AndroidHardening-13.0) 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 dd690419..e187fbcb 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,6 +572,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28688/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0004/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch @@ -584,5 +585,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p584" +editKernelLocalversion "-dos.p585" cd "$DOS_BUILD_BASE" 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 8c0e54ec..2981eee8 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 @@ -453,7 +453,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -465,5 +464,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p465" +editKernelLocalversion "-dos.p464" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 96f405b4..1de51490 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -71,7 +71,7 @@ enterAndClear "device/qcom/sepolicy"; patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/11/310811/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles 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 6b742697..4dabd3ce 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 @@ -290,7 +290,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -303,5 +302,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p303" +editKernelLocalversion "-dos.p302" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index f61a1a68..1756ef93 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -39,7 +39,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch @@ -270,7 +270,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0015.patch @@ -291,9 +292,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p295" +editKernelLocalversion "-dos.p298" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index e25c2a48..317520c9 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -74,7 +74,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it pie-firewall; - repopick -it P_asb_2021-05; + repopick -i 308977; #Backgrounds: Optimize builtin wallpaper loading code source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 6fb3b2c9..784fba4b 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -73,7 +73,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/11/310811/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 82bc958c..259bf4da 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch @@ -198,7 +198,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch @@ -221,9 +222,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p225" +editKernelLocalversion "-dos.p228" cd "$DOS_BUILD_BASE" 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 e12b6c66..709c7a12 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 @@ -353,7 +353,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -369,5 +368,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-5853/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p369" +editKernelLocalversion "-dos.p368" cd "$DOS_BUILD_BASE" 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 bc98f3fa..1a2bf3fd 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 @@ -41,7 +41,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch @@ -241,7 +241,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0044.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch @@ -264,9 +265,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p268" +editKernelLocalversion "-dos.p271" 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 39e9800c..3d9c9e94 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 @@ -409,7 +409,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -422,5 +421,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p422" +editKernelLocalversion "-dos.p421" cd "$DOS_BUILD_BASE" 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 8a33eb4f..34a43bc9 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 @@ -268,9 +268,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/^5.8/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3506/4.18-^5.12/0001.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-23133/4.19/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.19/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.19/0009.patch @@ -295,16 +297,19 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29264/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.19/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.19/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.19/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch 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-0466/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-2732/4.19/0009.patch 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 -editKernelLocalversion "-dos.p306" +editKernelLocalversion "-dos.p311" 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 b4c19869..c7f9dc80 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 @@ -365,11 +365,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/4.14/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.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.p371" +editKernelLocalversion "-dos.p373" 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 fb1705ee..cd358d1f 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 @@ -217,7 +217,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch @@ -238,7 +239,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p240" +editKernelLocalversion "-dos.p242" cd "$DOS_BUILD_BASE" 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 405eb721..16b60435 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 @@ -216,7 +216,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch @@ -237,7 +238,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.4/0004.patch -editKernelLocalversion "-dos.p239" +editKernelLocalversion "-dos.p241" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 0b4dc81c..8be8c750 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -70,7 +70,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/11/310811/1; #update webview enterAndClear "external/svox"; git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles 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 9339c4d7..b29588bb 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 @@ -93,17 +93,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15291/4.4/0006.patch 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-11234/4.4/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11234/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11234/4.4/0005.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/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26147/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1905/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1906/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1927/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch -editKernelLocalversion "-dos.p105" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch +editKernelLocalversion "-dos.p102" 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 c26eed63..7f136e36 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 @@ -114,6 +114,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3493/^5.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0005.patch @@ -139,9 +140,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.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.p143" +editKernelLocalversion "-dos.p146" 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 18d38bba..d6d49083 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 @@ -46,7 +46,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch @@ -127,7 +127,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3347/4.9/0045.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch @@ -150,7 +151,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch -editKernelLocalversion "-dos.p152" +editKernelLocalversion "-dos.p155" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh index bf0d1e81..d88e816f 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -170,7 +170,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.4/0014.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-20261/4.4/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.4/0011.patch @@ -191,5 +192,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28964/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.4/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.4/0005.patch -editKernelLocalversion "-dos.p191" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch +editKernelLocalversion "-dos.p193" 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 d2ca62eb..96237df2 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 @@ -441,7 +441,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -453,5 +452,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p453" +editKernelLocalversion "-dos.p452" cd "$DOS_BUILD_BASE" 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 06db6c91..beb10522 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 @@ -353,7 +353,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-0399/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3178/3.18/0008.patch 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-23133/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27363/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-27365/3.18/0015.patch @@ -366,5 +365,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch -editKernelLocalversion "-dos.p366" +editKernelLocalversion "-dos.p365" cd "$DOS_BUILD_BASE" 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 19359bfe..c3222706 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 @@ -52,5 +52,9 @@ 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-2020-26147/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1906/ANY/0002.patch -editKernelLocalversion "-dos.p52" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch +editKernelLocalversion "-dos.p56" 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 dc41895f..9fd2112a 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 @@ -42,7 +42,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch @@ -166,7 +166,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0015.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0016.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.9/0017.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.9/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.9/0014.patch @@ -189,9 +190,11 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28972/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p193" +editKernelLocalversion "-dos.p196" 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 48d79352..3abaff1a 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 @@ -138,6 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3483/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.14/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26930/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-26931/4.14/0005.patch @@ -163,10 +164,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.14/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.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.p168" +editKernelLocalversion "-dos.p171" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh index 397f8d29..c0b05d03 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -50,6 +50,8 @@ 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-2020-26147/^5.12/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1906/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0006.patch -editKernelLocalversion "-dos.p51" +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23133/4.4/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-23134/4.4/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.4/0006.patch +editKernelLocalversion "-dos.p53" 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 dafa0462..e69a1456 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 @@ -39,7 +39,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-3695/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16USB/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0605/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/4.9/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0627/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7477/4.9/0005.patch @@ -68,7 +67,6 @@ 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-2020-26147/^5.12/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33034/^5.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-FragAttacks/^5.13/0004.patch -editKernelLocalversion "-dos.p70" +editKernelLocalversion "-dos.p68" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/Functions.sh b/Scripts/LineageOS-18.1/Functions.sh index b93048d8..5aa7141b 100644 --- a/Scripts/LineageOS-18.1/Functions.sh +++ b/Scripts/LineageOS-18.1/Functions.sh @@ -104,7 +104,6 @@ patchWorkspace() { if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; #source build/envsetup.sh; - #repopick -i 310548; #bt sbc fixes source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-18.1/Patch.sh b/Scripts/LineageOS-18.1/Patch.sh index 4280730f..992c2c07 100644 --- a/Scripts/LineageOS-18.1/Patch.sh +++ b/Scripts/LineageOS-18.1/Patch.sh @@ -65,7 +65,7 @@ patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.pa echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices enterAndClear "external/chromium-webview"; -git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/56/309756/1; #update webview +git pull "https://github.com/LineageOS/android_external_chromium-webview" refs/changes/11/310811/1; #update webview enterAndClear "frameworks/base"; hardenLocationConf services/core/java/com/android/server/location/gps_debug.conf;