diff --git a/Patches/Linux b/Patches/Linux index 05803018..cf8d0ba7 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 05803018db1a793a4691c0fc5cb691b41be654a4 +Subproject commit cf8d0ba74cef70771a3f8381b80e953ad4189e65 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index 12233ff2..798e12c0 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -34,23 +34,25 @@ commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch"; commentPatches android_kernel_essential_msm8998.sh "CVE-2017-13218/4.4/0026.patch"; +commentPatches android_kernel_google_bonito.sh "CVE-2020-0067/ANY/0001.patch"; commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch"; +commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067/ANY/0001.patch"; commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-Copperhead-Kernel_Hardening/3.18/0048.patch" "0006-Copperhead-Kernel_Hardening/3.18/0049.patch" "CVE-2017-13162/3.18/0001.patch"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima/0001.patch" "CVE-2017-11015/prima/0002.patch"; commentPatches android_kernel_htc_flounder.sh "CVE-2018-9514/ANY/0001.patch"; commentPatches android_kernel_htc_msm8994.sh "CVE-2016-8394/ANY/0001.patch" "CVE-2017-13166/3.10/0001.patch"; -commentPatches android_kernel_lge_msm8996.sh "CVE-2017-13162/3.18/0001.patch"; +commentPatches android_kernel_lge_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0004.patch"; commentPatches android_kernel_motorola_msm8916.sh "0001-LinuxIncrementals/3.10/3.10.0050-0051.patch" "CVE-2018-9514/ANY/0001.patch"; commentPatches android_kernel_motorola_msm8974.sh "CVE-2016-5696/3.4/0001.patch" "CVE-2017-7373/3.4/0001.patch"; commentPatches android_kernel_motorola_msm8992.sh "CVE-2017-14880/3.10/0001.patch" "CVE-2018-3585/3.10/0001.patch"; -commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162/3.18/0001.patch"; +commentPatches android_kernel_motorola_msm8996.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0004.patch"; commentPatches android_kernel_nextbit_msm8992.sh "CVE-2018-3585/3.10/0001.patch"; commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch"; -commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch"; +commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2019-14070/ANY/0004.patch"; commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0010.patch" "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0013.patch" "CVE-2019-11599/^4.9/0002.patch"; -commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0010.patch" "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0013.patch"; +commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening/4.4/0010.patch" "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0013.patch" "CVE-2019-14070/ANY/0003.patch"; commentPatches android_kernel_samsung_smdk4412.sh "CVE-2016-8463/ANY/0001.patch"; commentPatches android_kernel_samsung_universal8890.sh "CVE-2016-7917/^4.5/0001.patch" "CVE-2018-1092/^4.15.15/0001.patch"; -commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599/^4.9/0002.patch"; +commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599/^4.9/0002.patch" "CVE-2019-14070/ANY/0003.patch"; commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922/^3.19.6/0001.patch" "CVE-2017-11015/prima/0001.patch" "CVE-2017-11015/prima/0002.patch"; commentPatches android_kernel_zuk_msm8996.sh "0008-Graphene-Kernel_Hardening/4.4/0010.patch" "0008-Graphene-Kernel_Hardening/4.4/0011.patch" "0008-Graphene-Kernel_Hardening/4.4/0013.patch"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh index d933b594..0497d203 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -306,7 +306,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index de93cf6a..f927c8e8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -378,7 +378,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index ccd11d62..5a3309a7 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -251,7 +251,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14049/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 38329544..f759f987 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -121,6 +121,7 @@ patchWorkspace() { repopick -it n-netd; repopick -i 268803 268804; #sqlite vulns repopick -it n-asb-2020-04; + repopick 271078; #update webview export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh index a97a76ae..1449eaf3 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -1,5 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/asus/fugu" +git apply $DOS_PATCHES_LINUX_CVES/0002-Misc_Fixes/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0004.patch @@ -317,5 +318,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch -editKernelLocalversion "-dos.p317" +editKernelLocalversion "-dos.p318" 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 4e9ec68a..77e33cc8 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 @@ -165,7 +165,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh index 83fde6a5..d723aafd 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -245,7 +245,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 9dea81ef..b98e6715 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -196,7 +196,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14055/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 62e60104..052b27e2 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -106,6 +106,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it O_asb_2020-04; + repopick 271078; #update webview export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh index 0875d6f2..e070809c 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_bonito.sh @@ -169,7 +169,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9447/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9448/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh index 73c95eeb..8f05ef79 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_crosshatch.sh @@ -164,7 +164,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9447/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9448/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9451/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-9466/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0067/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-8649/^5.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-9383/^5.5.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh index d1e5e2de..bc338bee 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_motorola_msm8996.sh @@ -136,7 +136,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh index bd58339c..37a1db67 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -131,7 +131,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15212/^5.1.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15213/^5.2.3/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh index f041d894..d85810ed 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_razer_msm8998.sh @@ -56,7 +56,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14029/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14072/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/^5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh index 1ced1860..b74ba71d 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_yandex_sdm660.sh @@ -61,7 +61,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14029/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14041/ANY/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0003.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14070/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14072/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14835/^5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-15098/^5.2.8/0001.patch diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 5eda0d6d..f9c2663d 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -119,6 +119,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -it P_asb_2020-04; + repopick 271078; #update webview source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";