diff --git a/Patches/Linux b/Patches/Linux index 06a0e537..c18a7429 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit 06a0e5372e7a42bba747e8dc2993ebe563558233 +Subproject commit c18a74298503a6ecb65895ccef942a047e7094a5 diff --git a/Patches/Wallpapers b/Patches/Wallpapers index b0347702..f0f7b5e0 160000 --- a/Patches/Wallpapers +++ b/Patches/Wallpapers @@ -1 +1 @@ -Subproject commit b0347702915ee1f4552562c368c531ceafaa352e +Subproject commit f0f7b5e041114405c617960c0e00762e377b8453 diff --git a/Scripts/LineageOS-11.0/Functions.sh b/Scripts/LineageOS-11.0/Functions.sh index f5d93126..43293eec 100644 --- a/Scripts/LineageOS-11.0/Functions.sh +++ b/Scripts/LineageOS-11.0/Functions.sh @@ -59,7 +59,6 @@ patchWorkspace() { source build/envsetup.sh; repopick -it asb-2018.09-cm11-qcom; repopick -i 230054 230392; #asb disclaimer - #repopick -it asb-2019.02-cm11; #merged, execpt for level #repopick -it asb-2019.03-cm11; #merged, execpt for level repopick -it asb-2019.04-cm11 -e 246293; repopick -it asb-2019.05-cm11; diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh index de2e6330..4d502e75 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh @@ -3,7 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/amazon/hdx-common" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0046-0047.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0077-0078.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0089-0090.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0004.patch git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh index 5d9b6d64..896ff0e8 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_fugu.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/asus/fugu" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004.patch @@ -120,6 +120,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8955/^4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8967/^4.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch @@ -310,5 +311,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- 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 git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p310" +editKernelLocalversion "-dos.p311" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh index 82bdcdac..dc965d02 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/asus/grouper" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch 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 4b9b8299..445cee02 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 @@ -2,10 +2,10 @@ cd "$DOS_BUILD_BASE""kernel/google/dragon" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0021.patch @@ -81,6 +81,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8953/^4.2.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8962/^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8966/3.15-^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10088/^4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10200/^4.8.14/0001.patch @@ -319,5 +320,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-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p319" +editKernelLocalversion "-dos.p320" 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 931f2c30..6798fd88 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 @@ -5,10 +5,10 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0072-0073.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0083-0084.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0019.patch @@ -391,6 +391,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2263/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -405,5 +406,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p405" +editKernelLocalversion "-dos.p406" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 9eb3b22f..5146a14c 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/htc/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh index fd88ac65..9dd0113d 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8994.sh @@ -2,7 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/htc/msm8994" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0088-0089.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch @@ -44,6 +44,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8942/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2117/^4.5.2/0001.patch @@ -234,5 +235,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p234" +editKernelLocalversion "-dos.p235" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh index a6a504e7..e89f22ad 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -3,7 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/huawei/angler" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0073-0074.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0083-0084.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004.patch @@ -55,6 +55,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8709/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0805/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0843/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch @@ -297,5 +298,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p297" +editKernelLocalversion "-dos.p298" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 0e7b9304..e0df2698 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -3,7 +3,7 @@ cd "$DOS_BUILD_BASE""kernel/lge/bullhead" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0073-0074.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0083-0084.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004.patch @@ -54,6 +54,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8709/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0805/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0843/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch @@ -294,5 +295,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch -editKernelLocalversion "-dos.p294" +editKernelLocalversion "-dos.p295" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh index 7d23d74e..388fcd35 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/g3" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 2a5374d1..e754e825 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh index 29b08ceb..505014c1 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_lge_msm8992.sh @@ -2,8 +2,8 @@ cd "$DOS_BUILD_BASE""kernel/lge/msm8992" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0088-0089.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch @@ -49,6 +49,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8967/^4.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2117/^4.5.2/0001.patch @@ -301,5 +302,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-8281/3.10/0003.patch -editKernelLocalversion "-dos.p301" +editKernelLocalversion "-dos.p302" 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 57fe0073..822b3f38 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 @@ -3,10 +3,10 @@ cd "$DOS_BUILD_BASE""kernel/lge/msm8996" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0032-0033.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.18/0002-Alt2.patch @@ -299,6 +299,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2263/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -311,5 +312,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p311" +editKernelLocalversion "-dos.p312" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh index 3083fefd..28c275b2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8916.sh @@ -4,7 +4,7 @@ cd "$DOS_BUILD_BASE""kernel/motorola/msm8916" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0052-0053.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0053-0054.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0087-0088.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.patch @@ -71,6 +71,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8950/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8955/^4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8967/^4.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2117/^4.5.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2543/^4.4.1/0001.patch @@ -184,6 +185,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9515/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9516/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9518/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10497/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/^5.0.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11884/^5.0.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12456/^5.1.5/0001.patch @@ -191,6 +193,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2001/^3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch @@ -198,5 +201,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-ch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p198" +editKernelLocalversion "-dos.p201" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 48443e73..8f0edef1 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -5,8 +5,8 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0046-0047.patch git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0048-0049.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0084-0085.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.4/3.4.0089-0090.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh index b500ad69..6718c279 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_motorola_msm8992.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/motorola/msm8992" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004-No_dir-relax.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 7dabb150..0d667dc5 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 @@ -5,11 +5,11 @@ git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0072-0073.pat git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0083-0084.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0019.patch @@ -376,6 +376,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2263/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -390,5 +391,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p390" +editKernelLocalversion "-dos.p391" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh index 4e9245f2..217d9a31 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_oneplus_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oneplus/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh index b2fe777e..ff54f3dd 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_jf.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/jf" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh index 9e72d3a5..ca0582e2 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_manta.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/manta" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 04d50222..75ada804 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh index 954a2717..56f93c09 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_smdk4412.sh @@ -2,6 +2,9 @@ cd "$DOS_BUILD_BASE""kernel/samsung/smdk4412" git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.3.2/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/^3.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4299/^3.11.6/0001.patch @@ -147,5 +150,5 @@ git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use- 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-2014-9781/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p147" +editKernelLocalversion "-dos.p150" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh index ef211c3b..e08e03d6 100644 --- a/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh +++ b/Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_samsung_tuna.sh @@ -2,6 +2,9 @@ cd "$DOS_BUILD_BASE""kernel/samsung/tuna" git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc2/ANY/0004.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2011-5327/^3.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-2375/^3.3.2/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-3375/^3.2.24/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6544/^3.6/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2012-6545/^3.6/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4299/^3.11.6/0001.patch @@ -142,5 +145,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/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-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p142" +editKernelLocalversion "-dos.p145" 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 07c9fb5a..2e3ee5f3 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 @@ -3,12 +3,12 @@ cd "$DOS_BUILD_BASE""kernel/samsung/universal8890" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0072-0073.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0013.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0013.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0019.patch @@ -72,6 +72,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8956/^4.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8962/^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8966/3.15-^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10088/^4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2069/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch @@ -295,5 +296,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-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-1000111/ANY/0001.patch -editKernelLocalversion "-dos.p295" +editKernelLocalversion "-dos.p296" cd "$DOS_BUILD_BASE" 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 91c32b4b..5c5e9f73 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,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/asus/fugu" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.10/0004.patch @@ -112,6 +112,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8944/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8955/^4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8967/^4.0/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2085/^4.5/0001.patch @@ -287,5 +288,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/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.p287" +editKernelLocalversion "-dos.p288" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh index 2ffcaf68..4aaccab5 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_essential_msm8998.sh @@ -58,6 +58,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-7273/^4.15.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-8043/^4.15.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-9415/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10142/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-10538/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11486/^5.0.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11810/^5.0.7/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-11833/^5.1.2/0001.patch @@ -72,6 +73,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2264/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch @@ -79,5 +82,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14875/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2018-11274/ANY/0001.patch -editKernelLocalversion "-dos.p79" +editKernelLocalversion "-dos.p82" 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 381f894e..79a2a404 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 @@ -2,10 +2,10 @@ cd "$DOS_BUILD_BASE""kernel/google/dragon" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0085-0086.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.18/3.18.0103-0104.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0002.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0010.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0011.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0010.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0011.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/3.18/0021.patch @@ -81,6 +81,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8953/^4.2.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8962/^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8966/3.15-^4.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9016/3.18/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0758/^4.6/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10088/^4.9/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10200/^4.8.14/0001.patch @@ -273,5 +274,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-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p273" +editKernelLocalversion "-dos.p274" 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 af651837..8c0b8eb6 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 @@ -215,6 +215,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2263/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch @@ -226,5 +227,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p226" +editKernelLocalversion "-dos.p227" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh index 0c43ada4..f9f92a6d 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_google_msm.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/google/msm" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh index bcc6d81b..59aa8f8d 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_flounder.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/htc/flounder" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.10/0001-Alt.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh index 9eb3b22f..5146a14c 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_htc_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/htc/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh index 9f0035bf..ea1353f1 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_huawei_angler.sh @@ -2,7 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/huawei/angler" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0073-0074.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.10/0001.patch @@ -55,6 +55,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8709/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0805/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0843/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch @@ -217,5 +218,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-2475/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-15845/ANY/0001.patch -editKernelLocalversion "-dos.p217" +editKernelLocalversion "-dos.p218" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh index 555c74ae..5d55c667 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_bullhead.sh @@ -2,7 +2,7 @@ cd "$DOS_BUILD_BASE""kernel/lge/bullhead" git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0073-0074.patch --exclude=Makefile git apply $DOS_PATCHES_LINUX_CVES/0001-LinuxIncrementals/3.10/3.10.0093-0094.patch --exclude=Makefile -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.10/0001.patch @@ -54,6 +54,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8709/^4.4.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8746/^4.2.2/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8812/^4.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-8844/^4.3.5/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-9289/^4.1.4/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0805/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-0843/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-10208/3.10-^3.16/0001.patch @@ -207,5 +208,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch -editKernelLocalversion "-dos.p207" +editKernelLocalversion "-dos.p208" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh index c06d2cfe..04512a1f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_g3.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/g3" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh index 4a932bed..1fa070ec 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_mako.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/mako" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh index 00cf8add..55622f63 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_lge_msm8996.sh index d8677c4b..800c6148 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 @@ -161,6 +161,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -169,5 +171,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6693/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p169" +editKernelLocalversion "-dos.p171" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh index 39bbfd62..d028ac1d 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_motorola_msm8974.sh @@ -1,7 +1,7 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/motorola/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0008.patch -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.patch +git apply $DOS_PATCHES_LINUX_CVES/0003-syzkaller-Misc/ANY/0008.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.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 b3093e47..cbd20041 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 @@ -240,6 +240,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2287/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -249,5 +251,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p249" +editKernelLocalversion "-dos.p251" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh index 86a48fe9..12225a1f 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oppo/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh index 04d50222..75ada804 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.patch diff --git a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh index 8b7dfedf..6a096eb7 100644 --- a/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh +++ b/Scripts/LineageOS-15.1/CVE_Patchers/android_kernel_samsung_universal9810.sh @@ -53,6 +53,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12818/^4.20.15/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/^5.0/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13272/^5.1.17/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13631/^5.2.1/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-13648/^5.2.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2024/^4.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch @@ -62,5 +63,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-6974/^4.20.8/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-7222/^4.20.5/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch -editKernelLocalversion "-dos.p62" +editKernelLocalversion "-dos.p63" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 9912562d..91587e0e 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -84,7 +84,8 @@ export -f buildAll; 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; + source build/envsetup.sh; + repopick -it o-tz-data-2019b; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; 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 e514303f..a0681a6f 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 @@ -133,6 +133,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-2263/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2290/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2341/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2345/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch @@ -145,5 +146,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p145" +editKernelLocalversion "-dos.p146" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh index c31faeae..a837119a 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_lge_mako.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/lge/mako" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0005-Copperhead-Deny_USB/3.4/3.4-Backport.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 53a3a6a1..47dcb420 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 @@ -138,6 +138,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0012.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2054/ANY/0013.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2101/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-2333/ANY/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3459/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-3460/^5.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-8912/^4.20.11/0001.patch @@ -146,5 +147,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2016-6696/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0610/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-0750/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-14883/ANY/0001.patch -editKernelLocalversion "-dos.p146" +editKernelLocalversion "-dos.p147" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh index 7ea41dfa..1a458dad 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_oppo_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/oppo/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh index 89341a3e..875370da 100644 --- a/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh +++ b/Scripts/LineageOS-16.0/CVE_Patchers/android_kernel_samsung_msm8974.sh @@ -1,6 +1,6 @@ #!/bin/bash cd "$DOS_BUILD_BASE""kernel/samsung/msm8974" -git apply $DOS_PATCHES_LINUX_CVES/0003-syskaller-Misc/ANY/0009.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 git apply $DOS_PATCHES_LINUX_CVES/0006-Copperhead-Kernel_Hardening/ANY/0001.patch diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 6248c2e1..5c6bbd85 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -63,7 +63,8 @@ export -f buildAll; 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; + source build/envsetup.sh; + repopick -it p-tzdata-2019b; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh";