Fixups + Churn

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-08-11 01:07:03 -04:00
parent dbfbdc93cf
commit dda4cd7ab5
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
26 changed files with 34 additions and 182 deletions

View file

@ -40,7 +40,7 @@ commentPatches() {
commentPatches android_kernel_amazon_hdx-common.sh "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch";
commentPatches android_kernel_asus_fugu.sh "CVE-2014-2568" "CVE-2014-8559" "CVE-2015-8746" "CVE-2017-5551" "LVT-2017-0003/3.10/0001.patch";
commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch";
commentPatches android_kernel_asus_grouper.sh "CVE-2017-15868" "CVE-2021-Misc2/3.4/0055.patch" "CVE-2021-Misc2/3.4/0056.patch" "CVE-2024-40904";
commentPatches android_kernel_asus_msm8916.sh "CVE-2018-13913/ANY/0001.patch";
commentPatches android_kernel_asus_msm8953.sh "CVE-2017-13162/3.18/0001.patch";
commentPatches android_kernel_cyanogen_msm8916.sh "CVE-2018-13913/ANY/0001.patch" "CVE-2018-5897" "CVE-2018-9514" "CVE-2018-11266";
@ -130,7 +130,7 @@ done
declare -a threeDotTen=("${threeDotFour[@]}" "android_kernel_htc_msm8994.sh" "android_kernel_lge_msm8992.sh" "android_kernel_motorola_msm8992.sh" "android_kernel_asus_fugu.sh" "android_kernel_asus_msm8916.sh" "android_kernel_htc_flounder.sh" "android_kernel_htc_msm8994.sh" "android_kernel_huawei_angler.sh" "android_kernel_lge_bullhead.sh" "android_kernel_moto_shamu.sh" "android_kernel_motorola_msm8952.sh" "android_kernel_nextbit_msm8992.sh" "android_kernel_oneplus_msm8994.sh" "android_kernel_cyanogen_msm8916.sh" "android_kernel_google_yellowstone.sh" "android_kernel_samsung_apq8084.sh" "android_kernel_motorola_msm8916.sh");
for script in "${threeDotTen[@]}"
do
commentPatches $script "CVE-2016-1583/3.18" "CVE-2018-17972/3.18" "CVE-2018-20169/3.18" "CVE-2019-2214/3.18" "CVE-2020-0427/3.18" "CVE-2021-21781/3.18" "CVE-2021-46939/3.18" "CVE-2022-40768/4.4" "CVE-2024-26773";
commentPatches $script "CVE-2016-1583/3.18" "CVE-2018-17972/3.18" "CVE-2018-20169/3.18" "CVE-2019-2214/3.18" "CVE-2020-0427/3.18" "CVE-2021-21781/3.18" "CVE-2021-46939/3.18" "CVE-2022-40768/4.4" "CVE-2024-26773" "CVE-2024-42154";
done
#3.18

View file

@ -586,7 +586,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39480/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39501/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39509/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40902/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40904/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40917/^6.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40943/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-40954/^6.10/0001.patch

View file

@ -769,7 +769,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch

View file

@ -854,7 +854,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-6937/3.10/0002.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.10/0004.patch

View file

@ -721,7 +721,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch

View file

@ -283,14 +283,13 @@ applyPatch "$DOS_PATCHES/android_frameworks_base/378956.patch"; #n-asb-2024-01 F
applyPatch "$DOS_PATCHES/android_frameworks_base/385241.patch"; #n-asb-2024-03 Resolve custom printer icon boundary exploit.
applyPatch "$DOS_PATCHES/android_frameworks_base/385242.patch"; #n-asb-2024-03 Close AccountManagerService.session after timeout.
applyPatch "$DOS_PATCHES/android_frameworks_base/388831.patch"; #n-asb-2024-04 Fix security vulnerability that creates user with no restrictions when accountOptions are too long.
applyPatch "$DOS_PATCHES/android_frameworks_base/399075-backport.patch"; #Q_asb_2024-06 Added throttle when reporting shortcut usage
applyPatch "$DOS_PATCHES/android_frameworks_base/399270.patch"; #Q_asb_2024-06 Added throttle when reporting shortcut usage
applyPatch "$DOS_PATCHES/android_frameworks_base/393646.patch"; #n-asb-2024-06 Add more checkKeyIntent checks to AccountManagerService.
applyPatch "$DOS_PATCHES/android_frameworks_base/393647.patch"; #n-asb-2024-06 Adds additional sanitization for Zygote command arguments.
applyPatch "$DOS_PATCHES/android_frameworks_base/393648.patch"; #n-asb-2024-06 Check hidden API exemptions
applyPatch "$DOS_PATCHES/android_frameworks_base/393649.patch"; #n-asb-2024-06 AccessibilityManagerService: remove uninstalled services from enabled list after service update.
applyPatch "$DOS_PATCHES/android_frameworks_base/396611.patch"; #n-asb-2024-07 Verify UID of incoming Zygote connections.
applyPatch "$DOS_PATCHES/android_frameworks_base/399269.patch"; #n-asb-2024-08 Restrict USB poups while setup is in progress
applyPatch "$DOS_PATCHES/android_frameworks_base/399270.patch"; #n-asb-2024-08 Added throttle when reporting shortcut usage
git revert --no-edit 0326bb5e41219cf502727c3aa44ebf2daa19a5b3; #Re-enable doze on devices without gms
applyPatch "$DOS_PATCHES/android_frameworks_base/248599.patch"; #Make SET_TIME_ZONE permission match SET_TIME (AOSP)
applyPatch "$DOS_PATCHES/android_frameworks_base/0001-Reduced_Resolution.patch"; #Allow reducing resolution to save power TODO: Add 800x480 (DivestOS)

View file

@ -859,7 +859,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.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

View file

@ -669,7 +669,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch

View file

@ -663,7 +663,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch

View file

@ -789,7 +789,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch

View file

@ -800,7 +800,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/LVT-2017-0003/3.10/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch

View file

@ -667,7 +667,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch

View file

@ -713,7 +713,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.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-2019-12819/3.18/0003.patch

View file

@ -518,7 +518,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.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/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch

View file

@ -667,7 +667,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch

View file

@ -713,7 +713,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/1035495_0001-cnss-Add-NULL-check-for-PM-related-APIs.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2015-4002/3.10/0004.patch

View file

@ -635,7 +635,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch

View file

@ -637,7 +637,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch

View file

@ -555,7 +555,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.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/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch

View file

@ -687,7 +687,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
#git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/3.18/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch