Update CVE patches + more globbing fixes

This commit is contained in:
Tad 2018-06-23 03:39:01 -04:00
parent a79c888157
commit 5772b68224
19 changed files with 35 additions and 37 deletions

@ -1 +1 @@
Subproject commit 5cc8355bcb7b79a9d4266b851d4679d06f6a0561
Subproject commit 8f939c08b3988d272037622994cc0eac75c12097

View File

@ -24,7 +24,7 @@ fi;
startPatcher() {
#$cvePatcher must be set!
java -jar "$cvePatcher" patch "$base" "$androidWorkspace""Patches/" "$cveScripts" "$1";
java -jar "$cvePatcher" patch "$base" "$androidWorkspace""Patches/" "$cveScripts" $1;
}
export -f startPatcher;

View File

@ -64,10 +64,11 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p69"
editKernelLocalversion "-dos.p70"
cd $base

View File

@ -106,6 +106,7 @@ git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch
@ -115,5 +116,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
editKernelLocalversion "-dos.p115"
editKernelLocalversion "-dos.p116"
cd $base

View File

@ -166,6 +166,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5825/3.10/0001.patch
@ -178,5 +179,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
editKernelLocalversion "-dos.p178"
editKernelLocalversion "-dos.p179"
cd $base

View File

@ -126,6 +126,7 @@ git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.18/0004.patch
git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch
@ -143,5 +144,5 @@ git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p143"
editKernelLocalversion "-dos.p144"
cd $base

View File

@ -74,11 +74,12 @@ git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-7541/3.10/0002.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p80"
editKernelLocalversion "-dos.p81"
cd $base

View File

@ -196,6 +196,7 @@ git apply $cvePatchesLinux/CVE-2017-9708/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-9720/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-9724/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9725/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
@ -206,5 +207,5 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
editKernelLocalversion "-dos.p206"
editKernelLocalversion "-dos.p207"
cd $base

View File

@ -129,6 +129,7 @@ git apply $cvePatchesLinux/CVE-2017-7495/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2017-7616/^4.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-7618/^4.10/0002.patch
git apply $cvePatchesLinux/CVE-2017-9698/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
git apply $cvePatchesLinux/Untracked/ANY/0004-net-add-recursion-limit-to-GRO.patch
git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
@ -136,5 +137,5 @@ git apply $cvePatchesLinux/Untracked/ANY/0007-USB-usbip-fix-potential-out-of-bou
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-1000111/ANY/0001.patch
editKernelLocalversion "-dos.p136"
editKernelLocalversion "-dos.p137"
cd $base

View File

@ -30,7 +30,7 @@ export -f resetWorkspace;
scanWorkspaceForMalware() {
scanQueue="$base/abi $base/android $base/art $base/bionic $base/bootable $base/build $base/dalvik $base/device $base/hardware $base/libcore $base/libnativehelper $base/ndk $base/packages $base/pdk $base/platform_testing $base/sdk $base/system";
scanQueue=$scanQueue" $base/vendor/cm $base/vendor/cmsdk";
scanForMalware true "$scanQueue";
scanForMalware true $scanQueue;
}
export -f scanWorkspaceForMalware;

View File

@ -99,6 +99,7 @@ git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-7371/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-7372/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9707/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0002-ozwpan-Use-unsigned-ints-to-prevent-heap-overflow.patch
git apply $cvePatchesLinux/Untracked/ANY/0005-tcp-fix-zero-cwnd-in-tcp_cwnd_reduction.patch
git apply $cvePatchesLinux/CVE-2016-5853/3.18/0002.patch
@ -107,5 +108,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch
editKernelLocalversion "-dos.p107"
editKernelLocalversion "-dos.p108"
cd $base

View File

@ -71,9 +71,10 @@ git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.10/0002.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
editKernelLocalversion "-dos.p75"
editKernelLocalversion "-dos.p76"
cd $base

View File

@ -105,6 +105,7 @@ git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-8269/3.10/0002.patch
git apply $cvePatchesLinux/CVE-2017-8280/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@ -112,5 +113,5 @@ git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15845/ANY/0001.patch
editKernelLocalversion "-dos.p112"
editKernelLocalversion "-dos.p113"
cd $base

View File

@ -96,10 +96,11 @@ git apply $cvePatchesLinux/CVE-2017-7472/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-7533/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/Untracked/ANY/0008-nfsd-check-for-oversized-NFSv2-v3-arguments.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
editKernelLocalversion "-dos.p101"
editKernelLocalversion "-dos.p102"
cd $base

View File

@ -25,7 +25,6 @@ git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0045.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0046.patch
git apply $cvePatchesLinux/0007-Copperhead-Kernel_Hardening/3.18/0050.patch
git apply $cvePatchesLinux/0010-Accelerated_AES/3.10+/0012.patch
git apply $cvePatchesLinux/0012-Copperhead-Deny_USB/3.18/0002-Alt2.patch
git apply $cvePatchesLinux/CVE-2014-9900/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2015-2041/^3.19/0002.patch
git apply $cvePatchesLinux/CVE-2015-7515/^4.4/0002.patch
@ -50,38 +49,23 @@ git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11031/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-11045/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-11077/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13162/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-13245/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-13218/3.18/0009.patch
git apply $cvePatchesLinux/CVE-2017-13246/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15842/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15843/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-15846/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-15857/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2017-16650/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0005.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0006.patch
git apply $cvePatchesLinux/CVE-2017-16USB/ANY/0009.patch
git apply $cvePatchesLinux/CVE-2017-17769/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2017-18066/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-5669/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch
git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-3585/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-3599/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5825/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-5831/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5833/3.18/0001.patch
git apply $cvePatchesLinux/CVE-2018-5848/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5849/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-5857/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0001/3.18/0004.patch
git apply $cvePatchesLinux/LVT-2017-0002/3.18/0003.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p83"
editKernelLocalversion "-dos.p67"
cd $base

View File

@ -58,9 +58,10 @@ git apply $cvePatchesLinux/CVE-2017-6345/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-7487/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-8269/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-9242/^4.11/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2016-2475/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p62"
editKernelLocalversion "-dos.p63"
cd $base

View File

@ -88,6 +88,7 @@ git apply $cvePatchesLinux/CVE-2017-5972/ANY/0002.patch
git apply $cvePatchesLinux/CVE-2017-6001/^4.9/0002.patch
git apply $cvePatchesLinux/CVE-2017-6348/^4.9/0001.patch
git apply $cvePatchesLinux/CVE-2017-8251/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3560/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.18/0002.patch
git apply $cvePatchesLinux/CVE-2018-3585/3.18/0002.patch
@ -103,5 +104,5 @@ git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0610/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-14883/ANY/0001.patch
editKernelLocalversion "-dos.p103"
editKernelLocalversion "-dos.p104"
cd $base

View File

@ -63,6 +63,7 @@ git apply $cvePatchesLinux/CVE-2017-8243/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2017-8281/3.10/0003.patch
git apply $cvePatchesLinux/CVE-2017-9723/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-1092/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2018-3563/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2018-3584/ANY/0001.patch
#git apply $cvePatchesLinux/CVE-2018-3585/3.10/0001.patch
@ -71,5 +72,5 @@ git apply $cvePatchesLinux/LVT-2017-0003/3.10/0001.patch
git apply $cvePatchesLinux/CVE-2016-6693/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2016-6696/ANY/0001.patch
git apply $cvePatchesLinux/CVE-2017-0750/ANY/0001.patch
editKernelLocalversion "-dos.p71"
editKernelLocalversion "-dos.p72"
cd $base

View File

@ -30,7 +30,7 @@ export -f resetWorkspace;
scanWorkspaceForMalware() {
scanQueue="$base/android $base/art $base/bionic $base/bootable $base/build $base/compatibility $base/dalvik $base/device $base/hardware $base/libcore $base/libnativehelper $base/packages $base/pdk $base/platform_testing $base/sdk $base/system";
scanQueue=$scanQueue" $base/lineage-sdk $base/vendor/lineage";
scanForMalware true "$scanQueue";
scanForMalware true $scanQueue;
}
export -f scanWorkspaceForMalware;