Skip to content
This repository was archived by the owner on Dec 23, 2024. It is now read-only.

Commit 4b5bd17

Browse files
Update CVE patchers
likely some breakage Signed-off-by: Tavi <[email protected]>
1 parent 2e84510 commit 4b5bd17

File tree

84 files changed

+857
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+857
-70
lines changed

Logs/resetWorkspace-LineageOS-15.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ external/caliper 4a0d9aba0856d0aa965d5653bfa4c138f0e8a8ba
6868
external/cblas d063db8bdddfcde61e4bad3bfe65941fd73e8094
6969
external/chromium-libpac 0ac78251d11006d764ba1aad8cc0867827fafe5c
7070
external/chromium-trace 8b2c0074e71a8086dee98ca8730acfdc5eddf7a1
71-
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
71+
external/chromium-webview 55628131e0608ae5877fd6934719369e5002b679
7272
external/clang 751a76679b0fb5798ea6cab75906df07edcab315
7373
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
7474
external/compiler-rt 0c46c9e892a3f68420635032ef2f6152dabd197c

Logs/resetWorkspace-LineageOS-16.0.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ external/capstone 6788a4139092f179005f7cdbf181ba24b60b6113
6767
external/cblas ddf5f49cb53866fbc503a6349bf44bac24a6963d
6868
external/chromium-libpac dff5ddb8d28f6ac9a86eb28763b4313f6f72eec5
6969
external/chromium-trace b2cf025c7d5cebd43084f38c6c7ff9cc17da428a
70-
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
70+
external/chromium-webview 55628131e0608ae5877fd6934719369e5002b679
7171
external/clang f9d2af42fc6d74c28893af371e4647158eaba66c
7272
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4
7373
external/cn-cbor 7fe9f01990a97be4df5e46d2decd894c06678072

Logs/resetWorkspace-LineageOS-17.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ external/catch2 bcfbb791d09e390fb545c03ca002e570f764d960
7878
external/cblas 61ee00692011385347a5dd1ad872556899a5cf7a
7979
external/chromium-libpac c98fc96035e6fdc5b84d953d2bd38d2dcd175467
8080
external/chromium-trace f4e722b911fcc6f7164026432de62a02ea3460fb
81-
external/chromium-webview ef62acbe255f65218a2122885a27624a0178ba14
81+
external/chromium-webview 55628131e0608ae5877fd6934719369e5002b679
8282
external/clang 8343f599c9e1dda8e6c1bb779af323a673a052f9
8383
external/cldr 4e0bdd442c1e01f5c6147cf6032ce4f8587f4ede
8484
external/cmockery 9199c7bfafefea32d1884182fa655b6e4578c1c4

Logs/resetWorkspace-LineageOS-18.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ external/zlib ec8d4c4bca51cbce4365f19d0e10c4e9575508b4
455455
external/zopfli 4e42ccafb7c571f502a23177bca2d3cfc209035c
456456
external/zxing 65193280855e46d11bf5b44f1a7e49ec0c7bd57e
457457
frameworks/av d2ebf6e8b5279140cdbd0c738a4dc11951995fc6
458-
frameworks/base c0376246d1fc6c928bf129b60fd9b4078b489b11
458+
frameworks/base 216a82f8590110c717b73ff8ebd74c578344f3a6
459459
frameworks/compile/libbcc fff6169b647b9c5d60350923019e8d60449a3652
460460
frameworks/compile/mclinker c7e43705055a74fd97f481fd31dddd8b9e307c4a
461461
frameworks/compile/slang 122ad4e102004cbf3bdc2b6f62b0d41aaa293541

Logs/resetWorkspace-LineageOS-19.1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ external/zopfli 8637d0c2c9bad61506e1633cb221a418421c9f02
621621
external/zstd 72b884f7fb33ebdebc0f61b5d0fb00fd6ca4713f
622622
external/zxing c52e3ef5b428edbd4d4b2d51f67e673fe04ce09e
623623
frameworks/av 923916e8261b7211d1c8639ff401ecb2b46ea292
624-
frameworks/base 8aa3a65b5c3e924391f7556ed72be06da5481b89
624+
frameworks/base fedcf692ef77dbdd66c0393c91c2f76a72cae62c
625625
frameworks/compile/libbcc 879916155c7757ba3a77c880ab1e949e8c6ed74b
626626
frameworks/compile/mclinker 3f42d04145e3c2f6bd6f236bc4eb4630d84fb3b7
627627
frameworks/compile/slang 5ad64063eeff6dd6c6affce457ed169e0e7b2a03

Logs/resetWorkspace-LineageOS-20.0.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,7 @@ external/zstd e6a035a8df42f375160f2acabe3caa283a0184d7
802802
external/zucchini 11a3a4cd409d6e0f4ccfcfb97cc962eeaeddde00
803803
external/zxing 248d7c742809ce1cbde1c4e6163d347e1feb274b
804804
frameworks/av 214685e2de63df75def32de6356a4d2853f5d5b7
805-
frameworks/base db93faff341e18661990091a066fbe076eb9a8da
805+
frameworks/base d39406eb4e7739ff74228942ffb2703498abaf62
806806
frameworks/compile/libbcc 81c07084cca2a6feab53eeb022f5d5a3ab5c10c5
807807
frameworks/compile/mclinker 18374a53dc8e00ec3667b4e1a257c9b4e41f007f
808808
frameworks/compile/slang 1738348ca3d011f3f340883bd48e03a8e6aeb143
@@ -1090,7 +1090,7 @@ packages/apps/RemoteProvisioner 06d16c8031ce54bff1a07cc64f8b02140a3753c1
10901090
packages/apps/SafetyRegulatoryInfo f5dfd6ab7ea6aaa1a0014106110733e316379e95
10911091
packages/apps/SecureElement 7e9d165899058103fa612ffb41858e4fd975182b
10921092
packages/apps/Seedvault e03ad756817631611b7497d9fe7b2173e2756b9d
1093-
packages/apps/Settings b2221f761b7f0874d38a2fbfb8b7a20dd28fcd30
1093+
packages/apps/Settings 1e4d60d4425868db0a27a6a1225f791048bfebfd
10941094
packages/apps/SettingsIntelligence 4ef92f41721f25bbdec5c0b2433547ef323e72ac
10951095
packages/apps/SetupWizard c7522b7aae6394711417818fe80c09c70fe547ca
10961096
packages/apps/SimpleDeviceConfig 82d31b18dd2550e05f89248f128cb571eecc863a

Patches/Linux

Submodule Linux updated from 87888c6 to b23d626

Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_amazon_hdx-common.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -900,6 +900,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35828/4.4/0001.patch
900900
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.4/0001.patch
901901
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
902902
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36016/4.4/0008.patch
903+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36286/^6.9/0001.patch
903904
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36902/4.4/0008.patch
904905
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/4.4/0008.patch
905906
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36946/4.4/0008.patch
@@ -910,6 +911,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38587/4.4/0001.patch
910911
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38589/4.4/0001.patch
911912
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38599/4.4/0001.patch
912913
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38607/4.4/0001.patch
914+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38659/^6.9/0001.patch
913915
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/772877_0001-usb-core-Fix-use-after-free-for-hub-usb-device.patch
914916
git apply $DOS_PATCHES_LINUX_CVES/CVE-2013-4592/3.4/0003.patch
915917
git apply $DOS_PATCHES_LINUX_CVES/CVE-2014-9728/3.4/0008.patch
@@ -922,7 +924,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch
922924
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.4/0008.patch
923925
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.4/0001.patch
924926
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.4/0001.patch
925-
editKernelLocalversion "-dos.p923"
927+
editKernelLocalversion "-dos.p924"
926928
else echo "kernel_amazon_hdx-common is unavailable, not patching.";
927929
fi;
928930
cd "$DOS_BUILD_BASE"

Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_asus_grouper.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,6 +563,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35828/4.4/0001.patch
563563
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.4/0001.patch
564564
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
565565
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36016/4.4/0008.patch
566+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36286/^6.9/0001.patch
566567
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36902/4.4/0008.patch
567568
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/4.4/0008.patch
568569
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36946/4.4/0008.patch
@@ -573,6 +574,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38587/4.4/0001.patch
573574
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38589/4.4/0001.patch
574575
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38599/4.4/0001.patch
575576
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38607/4.4/0001.patch
577+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38659/^6.9/0001.patch
576578
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
577579
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch
578580
git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14053/3.4/0001.patch
@@ -581,7 +583,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch
581583
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.4/0008.patch
582584
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.4/0001.patch
583585
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.4/0001.patch
584-
editKernelLocalversion "-dos.p582"
586+
editKernelLocalversion "-dos.p583"
585587
else echo "kernel_asus_grouper is unavailable, not patching.";
586588
fi;
587589
cd "$DOS_BUILD_BASE"

Scripts/LineageOS-14.1/CVE_Patchers/android_kernel_htc_msm8960.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35828/4.4/0001.patch
600600
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35886/4.4/0001.patch
601601
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35930/4.4/0001.patch
602602
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36016/4.4/0008.patch
603+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36286/^6.9/0001.patch
603604
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36902/4.4/0008.patch
604605
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36919/4.4/0008.patch
605606
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-36946/4.4/0008.patch
@@ -610,6 +611,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38587/4.4/0001.patch
610611
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38589/4.4/0001.patch
611612
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38599/4.4/0001.patch
612613
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38607/4.4/0001.patch
614+
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-38659/^6.9/0001.patch
613615
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/797912_0001-usb-gadget-Fix-synchronization-issue-between-f_audio.patch
614616
git apply $DOS_PATCHES_LINUX_CVES/Untracked-02/ANY/870057_0001-wcnss-add-null-check-in-pm_ops-unregister.patch
615617
git apply $DOS_PATCHES_LINUX_CVES/CVE-2017-13167/3.4/0014.patch
@@ -619,7 +621,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-20423/3.4/0010.patch
619621
git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.4/0008.patch
620622
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.4/0001.patch
621623
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.4/0001.patch
622-
editKernelLocalversion "-dos.p620"
624+
editKernelLocalversion "-dos.p621"
623625
else echo "kernel_htc_msm8960 is unavailable, not patching.";
624626
fi;
625627
cd "$DOS_BUILD_BASE"

0 commit comments

Comments
 (0)