Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2025-05-06 08:24:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

19.1: switch to latest hardened_malloc revision

Browse source 
+ other fixes

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-05-06 14:11:19 -04:00
parent c26af5a755
commit 2c90c48637
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
14 changed files with 68 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
View file

@ -430,7 +430,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48619/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48636/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48651/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48659/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48672/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48687/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48695/4.14/0003.patch
@ -607,7 +606,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
editKernelLocalversion "-dos.p607"
editKernelLocalversion "-dos.p606"
else echo "kernel_xiaomi_sm6150 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh
View file

@ -516,7 +516,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48619/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48636/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48651/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48659/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48672/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48687/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48695/4.14/0003.patch
@ -699,7 +698,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.14/0002.patch
editKernelLocalversion "-dos.p699"
editKernelLocalversion "-dos.p698"
else echo "kernel_xiaomi_sm8150 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-19.1/Functions.sh
View file

@ -66,10 +66,9 @@ patchWorkspaceReal() {
verifyAllPlatformTags;
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh;
#source build/envsetup.sh;
#repopick -ift twelve-bt-sbc-hd-dualchannel;
#repopick -it twelve-colors;
repopick -it S_asb_2024-04;
sh "$DOS_SCRIPTS/Patch.sh";
sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";

4
Scripts/LineageOS-19.1/Patch.sh
View file

@ -119,6 +119,10 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then
if enterAndClear "external/hardened_malloc"; then
applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-1.patch"; #Workarounds for Pixel 3 SoC era camera driver bugs (GrapheneOS)
applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0001-Broken_Cameras-2.patch"; #Expand workaround to all camera executables (DivestOS)
applyPatch "$DOS_PATCHES/android_external_hardened_malloc/0002-Broken_Displays.patch"; #Add workaround for OnePlus 8 & 9 display driver crash (DivestOS)
sed -i 's/34359738368/2147483648/' Android.bp; #revert 48-bit address space requirement
sed -i -e '76,78d;' Android.bp; #fix compile under A13
sed -i -e '22,24d;' androidtest/Android.bp; #fix compile under A12
fi;
fi;

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_google_msm-4.14.sh
View file

@ -75,7 +75,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-3061/^5.18/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-4382/^6.2/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20382/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3777/^6.5/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-6270/^6.8/0001.patch
@ -160,7 +159,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch
editKernelLocalversion "-dos.p160"
editKernelLocalversion "-dos.p159"
else echo "kernel_google_msm-4.14 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sm8150.sh
View file

@ -483,7 +483,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48619/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48636/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48651/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48659/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48672/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48687/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48695/4.14/0003.patch
@ -665,7 +664,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.14/0002.patch
editKernelLocalversion "-dos.p665"
editKernelLocalversion "-dos.p664"
else echo "kernel_oneplus_sm8150 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_sm6150.sh
View file

@ -83,7 +83,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0590/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3567/4.14/0007.patch
@ -173,7 +172,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch
editKernelLocalversion "-dos.p173"
editKernelLocalversion "-dos.p172"
else echo "kernel_xiaomi_sm6150 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

3
Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_xiaomi_vayu.sh
View file

@ -81,7 +81,6 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20158/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20371/ANY/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-27950/^5.16/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-48671/^6.0/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-0590/4.14/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-1989/4.14/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-3567/4.14/0007.patch
@ -178,7 +177,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27059/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27074/^6.8/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27075/^6.8/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27388/^6.8/0002.patch
editKernelLocalversion "-dos.p178"
editKernelLocalversion "-dos.p177"
else echo "kernel_xiaomi_vayu is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"