diff --git a/Patches/Linux b/Patches/Linux index 4438e071..3cad5196 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 4438e071d7b034ff691ce6e25b4bec09020b7f40 +Subproject commit 3cad5196b34b3e5591818222097d9ffd6c252b11 diff --git a/Scripts/Common/Fix_CVE_Patchers.sh b/Scripts/Common/Fix_CVE_Patchers.sh index f905fdd6..8e357505 100644 --- a/Scripts/Common/Fix_CVE_Patchers.sh +++ b/Scripts/Common/Fix_CVE_Patchers.sh @@ -41,7 +41,7 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067"; commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_google_dragon.sh "CVE-2015-4167/^3.19.1/0001.patch" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214"; commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067"; -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" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-14381" "CVE-2020-16166"; +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" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166"; commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima"; commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992"; commentPatches android_kernel_google_wahoo.sh "CVE-2019-14047/ANY/0002.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166"; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh index 68667a1a..7f174412 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_dragon.sh @@ -205,6 +205,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7616/^4.10.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7618/3.18/0003.patch @@ -222,6 +223,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9076/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/3.18/0003.patch @@ -273,7 +275,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16647/^4.13.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -572,5 +574,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p572" +editKernelLocalversion "-dos.p574" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh index 73b62eaf..693dac42 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -181,6 +181,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7616/^4.10.9/0001.patch @@ -216,6 +217,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9719/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9720/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9722/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10998/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11001/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11002/ANY/0002.patch @@ -296,7 +298,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15857/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15858/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15868/3.18/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16525/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16526/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16527/3.18/0004.patch @@ -311,7 +313,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -617,7 +619,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20810/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch @@ -681,5 +683,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p681" +editKernelLocalversion "-dos.p683" cd "$DOS_BUILD_BASE" 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 490ffb71..d0f9883c 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 @@ -147,6 +147,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7616/^4.10.9/0001.patch @@ -161,6 +162,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9711/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/3.18/0004.patch @@ -222,7 +224,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -594,5 +596,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p594" +editKernelLocalversion "-dos.p596" cd "$DOS_BUILD_BASE" 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 256060f1..24cacf17 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 @@ -154,6 +154,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7369/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7370/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/3.18/0005.patch @@ -204,6 +205,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9720/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9722/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10663/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10998/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11001/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11002/ANY/0002.patch @@ -296,7 +298,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -664,5 +666,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p664" +editKernelLocalversion "-dos.p666" cd "$DOS_BUILD_BASE" 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 716a16ac..42d76297 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 @@ -115,6 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7294/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8064/3.18/0004.patch @@ -126,6 +127,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9711/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12154/3.18/0003.patch @@ -175,7 +177,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -537,5 +539,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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 -editKernelLocalversion "-dos.p537" +editKernelLocalversion "-dos.p539" cd "$DOS_BUILD_BASE" 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 bcbe007a..a82a4506 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 @@ -190,6 +190,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7616/^4.10.9/0001.patch @@ -205,6 +206,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10663/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10996/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11089/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11090/ANY/0001.patch @@ -253,7 +255,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -560,5 +562,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0004-net-add-recursion-limit- git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p560" +editKernelLocalversion "-dos.p562" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh index 976c5798..ef6a87a6 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_zte_msm8996.sh @@ -132,6 +132,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7374/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7533/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7541/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch @@ -171,6 +172,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9720/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9722/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10663/3.18/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10998/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11001/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11002/ANY/0002.patch @@ -268,7 +270,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -633,5 +635,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6198/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-5897/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p633" +editKernelLocalversion "-dos.p635" cd "$DOS_BUILD_BASE" 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 3d10a6f7..7a352927 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 @@ -193,6 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7346/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7472/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7482/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7487/3.18/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7616/^4.10.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7618/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7645/3.18/0005.patch @@ -208,6 +209,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9074/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9242/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9698/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11176/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11473/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11600/3.10-^4.12.3/0001.patch @@ -247,7 +249,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16647/^4.13.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -515,5 +517,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-9178/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7542/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p515" +editKernelLocalversion "-dos.p517" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh index 837f3d68..fe71da6f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_marlin.sh @@ -123,10 +123,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9704/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9707/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9984/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11034/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11039/ANY/0001.patch @@ -161,7 +163,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -416,7 +418,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-20812/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0009/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch @@ -473,7 +475,7 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0002-ozwpan-Use-unsigned-ints git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch 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-2017-15951/3.18/0005.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 -editKernelLocalversion "-dos.p475" +editKernelLocalversion "-dos.p477" 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 3390b015..6e15c998 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 @@ -91,6 +91,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch @@ -98,6 +99,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9704/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9704/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10810/^4.11.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11045/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11077/ANY/0001.patch @@ -114,7 +116,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15846/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15851/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15857/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18306/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/3.18/0003.patch @@ -415,5 +417,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p415" +editKernelLocalversion "-dos.p417" cd "$DOS_BUILD_BASE" 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 02ef64a7..dd2029b4 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 @@ -98,6 +98,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8251/3.18/0002.patch @@ -106,6 +107,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9711/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10810/^4.11.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12190/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12193/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13080/3.18/0005.patch @@ -143,7 +145,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16643/3.5-^4.13.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -512,5 +514,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p512" +editKernelLocalversion "-dos.p514" cd "$DOS_BUILD_BASE" 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 5bb07237..27140396 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 @@ -97,12 +97,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10810/^4.11.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12154/3.18/0003.patch @@ -133,7 +135,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -453,5 +455,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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 -editKernelLocalversion "-dos.p453" +editKernelLocalversion "-dos.p455" cd "$DOS_BUILD_BASE" 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 d8bfd380..053ee844 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 @@ -96,12 +96,14 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8824/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10810/^4.11.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12153/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-12154/3.18/0003.patch @@ -133,7 +135,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16538/3.18/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16645/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16646/3.18/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16911/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch @@ -481,5 +483,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.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 -editKernelLocalversion "-dos.p481" +editKernelLocalversion "-dos.p483" cd "$DOS_BUILD_BASE" 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 b2d39333..b20b9879 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 @@ -77,7 +77,9 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9605/^4.11.4/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch @@ -87,7 +89,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000252/^4.13.3/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000370/^4.11.5/0001.patch @@ -251,5 +253,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p251" +editKernelLocalversion "-dos.p253" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh index 6fa945af..0f66cadb 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_google_marlin.sh @@ -106,8 +106,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9704/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9707/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11034/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11039/ANY/0001.patch @@ -117,8 +119,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15827/3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18150/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18161/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18165/ANY/0001.patch @@ -269,7 +271,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0066/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch @@ -331,5 +333,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp 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 -editKernelLocalversion "-dos.p331" +editKernelLocalversion "-dos.p333" cd "$DOS_BUILD_BASE" 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 1bd2919d..8dfe9907 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 @@ -87,11 +87,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8251/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13220/ANY/0001.patch @@ -103,7 +105,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15853/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16914/3.18/0003.patch @@ -372,5 +374,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p372" +editKernelLocalversion "-dos.p374" cd "$DOS_BUILD_BASE" 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 2fbf8b7e..717fe66d 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 @@ -88,10 +88,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch @@ -103,7 +105,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16914/3.18/0003.patch @@ -370,5 +372,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-13096/^4.17.3/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch -editKernelLocalversion "-dos.p370" +editKernelLocalversion "-dos.p372" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh index 63ffc088..cd3bf01c 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_fxtec_msm8998.sh @@ -43,12 +43,10 @@ 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-2019-19813/4.4/0004.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.4/0006.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-12352/ANY/0011.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 -editKernelLocalversion "-dos.p50" +editKernelLocalversion "-dos.p48" 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 1a5ba36f..247fe415 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 @@ -106,8 +106,10 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7371/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7372/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9704/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-9707/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11034/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11036/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11039/ANY/0001.patch @@ -117,8 +119,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15827/3.18/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18150/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18161/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18165/ANY/0001.patch @@ -257,7 +259,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0030/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0040/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0255/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0404/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch +#git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0427/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0431/^3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-3625/ANY/0001.patch @@ -318,5 +320,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-01/ANY/0005-tcp-fix-zero-cwnd-in-tcp 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 -editKernelLocalversion "-dos.p318" +editKernelLocalversion "-dos.p320" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh index 79b1c695..af8a7499 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_lge_msm8996.sh @@ -91,11 +91,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10810/^4.11.8/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13168/3.18/0004.patch @@ -106,7 +108,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13693/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13694/^4.12.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18360/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18509/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-18551/3.18/0002.patch @@ -408,5 +410,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p408" +editKernelLocalversion "-dos.p410" 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 1bd2919d..8dfe9907 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 @@ -87,11 +87,13 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8251/3.18/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13220/ANY/0001.patch @@ -103,7 +105,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15102/^4.8.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15853/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15951/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16532/3.18/0003.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/^4.13.11/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16650/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16912/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16913/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-16914/3.18/0003.patch @@ -372,5 +374,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p372" +editKernelLocalversion "-dos.p374" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index 6d2c2c16..cbb5702f 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -87,10 +87,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-5669/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6001/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-6348/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7273/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-7518/3.18/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8068/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8069/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8924/3.18/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8925/3.18/0005.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-10911/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-11031/3.18/0001.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13162/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13218/3.18/0010.patch @@ -325,5 +327,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-28974/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29371/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 -editKernelLocalversion "-dos.p325" +editKernelLocalversion "-dos.p327" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh index 22b1480a..2a62e22a 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sdm845.sh @@ -53,8 +53,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-16994/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19051/4.9/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19068/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19318/^5.3.11/0001.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19813/4.9/0005.patch -git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-19816/4.9/0007.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 @@ -63,5 +61,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-12352/ANY/0011.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 -editKernelLocalversion "-dos.p63" +editKernelLocalversion "-dos.p61" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 46a779c8..de32ad23 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -130,7 +130,6 @@ patchWorkspace() { #repopick -it ten-firewall; #repopick -it CVE-2019-2306; repopick -i 293123; #update webview - #repopick -i 294717; #clark: audio crackle source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 816c6898..113ec833 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -276,7 +276,6 @@ enterAndClear "device/oneplus/oneplus2"; sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; enterAndClear "device/oneplus/msm8998-common"; -patch -p1 < "$DOS_PATCHES_COMMON/android_device_audio/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation enterAndClear "device/oneplus/sm8150-common";