Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-12-12 01:14:22 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixup

Browse Source 
smoke tested:
taimen/4.4, fajita/4.9, flame/4.14, bluejay/5.10

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-10-27 12:44:05 -04:00
parent 565563517c
commit 2a4fac087d
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Scripts/Common/Fix_CVE_Patchers.sh
View File

@ -55,8 +55,8 @@ commentPatches android_kernel_google_bonito.sh "CVE-2020-0067";
commentPatches android_kernel_google_coral.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324";
commentPatches android_kernel_google_dragon.sh "0006-AndroidHardening-Kernel_Hardening/3.18/0026.patch" "0008-Graphene-Kernel_Hardening-ro" "CVE-2015-4167" "CVE-2017-15951" "CVE-2016-1237" "CVE-2016-6198" "CVE-2017-7374" "CVE-2018-17972" "CVE-2019-2214" "CVE-2021-39715/ANY/0001.patch" "CVE-2024-46777";
commentPatches android_kernel_google_crosshatch.sh "CVE-2020-0067";
commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826";
commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826";
commentPatches android_kernel_google_gs101_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826" "CVE-2022-48961";
commentPatches android_kernel_google_gs201_private_gs-google.sh "CVE-2021-29648/^5.11/0001.patch" "CVE-2023-6817/5.10/0002.patch" "CVE-2023-52462/5.10/0002.patch" "CVE-2023-52672" "CVE-2024-26733/5.10/0002.patch" "CVE-2023-52656/5.10" "CVE-2024-26882" "CVE-2024-38564" "CVE-2022-48862" "CVE-2024-46681" "CVE-2024-46826" "CVE-2022-48961";
commentPatches android_kernel_google_marlin.sh "0001-LinuxIncrementals/3.18/3.18.0098-0099.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0048.patch" "0006-AndroidHardening-Kernel_Hardening/3.18/0049.patch" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2017-13162/3.18/0001.patch" "CVE-2017-14883" "CVE-2017-15951" "CVE-2018-17972" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-42896/4.9";
commentPatches android_kernel_google_msm.sh "CVE-2017-11015/prima" "CVE-2021-Misc2/ANY/0031.patch";
commentPatches android_kernel_google_msm-4.9.sh "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-1749" "CVE-2020-8992" "CVE-2021-30324" "CVE-2021-45469" "CVE-2021-30319";

2
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs101_private_gs-google.sh
View File

@ -115,7 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48956/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48958/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48959/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48960/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48961/^6.1/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48961/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48962/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48966/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48967/5.10/0006.patch

2
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_gs201_private_gs-google.sh
View File

@ -115,7 +115,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48956/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48958/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48959/5.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48960/5.10/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48961/^6.1/0001.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48961/^6.1/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48962/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48966/5.10/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48967/5.10/0006.patch

3
Scripts/LineageOS-20.0/Functions.sh
View File

@ -162,8 +162,7 @@ patchWorkspaceReal() {
verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh;
repopick -it T_asb_2024-10;
#source build/envsetup.sh;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";