Merge branch 'master-upstream' into axp

# Conflicts:
#	Scripts/Common/Fix_CVE_Patchers.sh
#	Scripts/LineageOS-20.0/CVE_Patchers/android_kernel_oneplus_sdm845.sh

Logs/resetWorkspace-LineageOS-19.1.txt

@@ -5,7 +5,7 @@ bootable/libbootloader b44eeefd365e023a96ea36682cc60b46827a47cc
 bootable/recovery 7c1eb300fbcf789024da690c96adb167d31aa5a5
 build/bazel f3015c3bbd520d95216123e6761a2860e17acebf
 build/blueprint c24408d5ae37cbcbec15205a02812b7d6c563b90
-build/make e8636448168564515d61170f1acec4a95ce16a85
+build/make 9ce529efc10432da0fe7468848ee703726ce969d
 build/pesto 0f35caa8191635ace102f6d8c96318c5ed52dfe3
 build/soong 59d5b37cce358e0d300392676d64191d3938608f
 compatibility/cdd 43611a0b6d2c62ae1d08d951fccf8f2ab8dc60c6
@@ -620,8 +620,8 @@ external/zlib a6339944368306c93d2d505e2f62d6b58f8d2fb4
 external/zopfli 8637d0c2c9bad61506e1633cb221a418421c9f02
 external/zstd 72b884f7fb33ebdebc0f61b5d0fb00fd6ca4713f
 external/zxing c52e3ef5b428edbd4d4b2d51f67e673fe04ce09e
-frameworks/av 923916e8261b7211d1c8639ff401ecb2b46ea292
-frameworks/base 2bde4c3e5cd1dc6259a94eff16f526fd692587b4
+frameworks/av e9b312c236408b1d33cb9209fb0686c7ae4171a1
+frameworks/base ef50b9e77a439f30cb01b0a557c06d57434c76f4
 frameworks/compile/libbcc 879916155c7757ba3a77c880ab1e949e8c6ed74b
 frameworks/compile/mclinker 3f42d04145e3c2f6bd6f236bc4eb4630d84fb3b7
 frameworks/compile/slang 5ad64063eeff6dd6c6affce457ed169e0e7b2a03
@@ -668,7 +668,7 @@ hardware/google/graphics/gs101 97abc71ca5f3ac3f7bfa996aa559e0a6ae7f6733
 hardware/google/interfaces e9fd9d77739aedee4e967d446828e30a65d59163
 hardware/google/pixel 6c355463b8125a6ec2dd421b856eec1219501ed4
 hardware/google/pixel-sepolicy 4f8794afa5220f47436dcfd1aa8b7fdbcbfab1e0
-hardware/interfaces cbb0f2c6f762a7bb0fa4b3b499d5470f401b3a8a
+hardware/interfaces ae469cee0dce6d71489588126a15da8e67a50102
 hardware/invensense f02e206950b5e2726b6ca7e44ecd6c0a5d7c7912
 hardware/knowles/athletico/sound_trigger_hal 0e0fa7e55608cae1a001dd7e7d5d69450ced38ef
 hardware/libhardware d05ce0065b8147d05adf0d68c8a182ebbe668d27
@@ -802,7 +802,7 @@ lineage/scripts e988793c8b7ef6922858e9f1fc7d3a0da90ab2f5
 packages/apps/AudioFX 2c1be3c3b062e397bfd1e780ddb0bae1f99c1b84
 packages/apps/Backgrounds f778988c6b8d36e87399b5678239d4f696e4cab2
 packages/apps/BasicSmsReceiver 7c6a070c68413bab5343043af3df220226759568
-packages/apps/Bluetooth 9639ba8fc43ee9e8affa7e795545c5d46d66bfb4
+packages/apps/Bluetooth 4199ffb1db8c4f80914a39f78bdc2cecf7b6c8dd
 packages/apps/Camera2 1a48d61effedfab1930dd3fa0931eafd3f50c32d
 packages/apps/Car/Calendar fa4e0f22818948486aed8ce4845e1eae62321564
 packages/apps/Car/Cluster 9b851957e49a1a47b6468c11e69a29794b1a8311
@@ -996,7 +996,7 @@ sdk b3f92fe65cc033dc02107cc127e0ae0e2a50a967
 system/apex e0731e932301591d3e86c7927fd8fa08bb585ae9
 system/bpf bb1485f836d496570a337f6d7b809a3e44191f71
 system/bpfprogs ed0aa6f1dac65b12a3eb1c3ee72947c9cb308aa4
-system/bt fb268a6fb288db4222f8f710c2d71ee066281239
+system/bt dd99e2366adbdac7f05aa1c162f887555d2afa78
 system/ca-certificates 595badb2fb42aba9a55d78ce40be36856b4a0f78
 system/chre daa9b56497b0c114dbfcf7ab758142a20eaeed9c
 system/connectivity/wificond 17bbcb27838fe84bfc2e830cab54a6bd8a41fa55
@@ -1111,8 +1111,8 @@ vendor/qcom/opensource/commonsys-intf/bluetooth 5be730e561df0103aa2ffa6cc5c649ac
 vendor/qcom/opensource/commonsys-intf/display 1b983da4adfc9318dae482ac1b93387852399e88
 vendor/qcom/opensource/commonsys/bluetooth_ext dfb8d1bf11f1b76413fbe2fd5bdbd7acddb1db6e
 vendor/qcom/opensource/commonsys/display 9fceface2db07457e0253576ca63d4fb86a75155
-vendor/qcom/opensource/commonsys/packages/apps/Bluetooth 20cee4102c2e8efed883eed622b1cebd086d4d14
-vendor/qcom/opensource/commonsys/system/bt 7ce0972142a2067c60d71de53b9913b8d285f0f6
+vendor/qcom/opensource/commonsys/packages/apps/Bluetooth 95d5a483465330c1daee381cef5a6253a5ff7a10
+vendor/qcom/opensource/commonsys/system/bt 3510ffa0486d725073abfcae8967ecd518bdf3df
 vendor/qcom/opensource/cryptfs_hw 70c5073d267b25186b1e713bdf89371336c28dc3
 vendor/qcom/opensource/data-ipa-cfg-mgr 1e7dcdcc41a9e9f200b8921737b10dd8bda6d35b
 vendor/qcom/opensource/dataservices 7df6e191d24b7aebfe6bdeaa330552321ba41a92

Scripts/Common/Fix_CVE_Patchers.sh

@@ -86,7 +86,7 @@ commentPatches android_kernel_oneplus_msm8994.sh "CVE-2018-3585/3.10/0001.patch"
 commentPatches android_kernel_oneplus_msm8996.sh "CVE-2017-13162/3.18/0001.patch" "CVE-2017-15951" "CVE-2017-16939" "CVE-2018-17972" "CVE-2019-2214" "CVE-2019-14070/ANY/0006.patch" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-14381" "CVE-2020-16166" "CVE-2022-42896/4.9" "CVE-2024-39467";
 commentPatches android_kernel_oneplus_msm8998.sh "0008-Graphene-Kernel_Hardening-slab" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-11599" "CVE-2019-19319" "CVE-2020-0305" "CVE-2020-8992" "CVE-2020-16166";
 commentPatches android_kernel_oneplus_sm7250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-42703/4.19/0003.patch";
-commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992" "CVE-2020-24588/4.14/0018.patch" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-1184/^5.18/0001.patch" "CVE-2022-42703/4.14/0002.patch" "CVE-2021-47237/4.14/0002.patch";
+commentPatches android_kernel_oneplus_sm8150.sh "CVE-2019-16746" "CVE-2019-19319" "CVE-2020-0067" "CVE-2020-8992" "CVE-2020-24588/4.14/0018.patch" "CVE-2021-30324" "CVE-2021-45469" "CVE-2022-1184/^5.18/0001.patch" "CVE-2022-42703/4.14/0002.patch" "CVE-2021-47237/4.14/0002.patch" "CVE-2023-52901";
 commentPatches android_kernel_oneplus_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-1184/^5.18/0001.patch" "CVE-2022-42703/4.19/0003.patch";
 commentPatches android_kernel_oneplus_sm8350.sh "CVE-2018-5873" "CVE-2022-1184/^5.18/0001.patch" "CVE-2023-52879/5.4";
 commentPatches android_kernel_razer_msm8998.sh "0008-Graphene-Kernel_Hardening-slab" "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch" "CVE-2019-14070/ANY/0005.patch" "CVE-2020-16166";
@@ -105,9 +105,9 @@ commentPatches android_kernel_sony_sdm660.sh "0008-Graphene-Kernel_Hardening-can
 commentPatches android_kernel_sony_sdm845.sh "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992";
 commentPatches android_kernel_xiaomi_msm8937.sh "CVE-2017-13162" "CVE-2019-14070" "CVE-2019-16746" "CVE-2020-0427" "CVE-2020-16166" "CVE-2021-39715/ANY/0001.patch" "CVE-2022-25715";
 commentPatches android_kernel_xiaomi_sdm660.sh "0008-Graphene-Kernel_Hardening-canaries/4.4/0002.patch";
-commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch";
+commentPatches android_kernel_xiaomi_sm8150.sh "CVE-2020-24588/4.14/0018.patch" "CVE-2023-52901";
 commentPatches android_kernel_xiaomi_vayu.sh "CVE-2020-24588/4.14/0018.patch";
-commentPatches android_kernel_xiaomi_sm6150.sh "CVE-2023-43550";
+commentPatches android_kernel_xiaomi_sm6150.sh "CVE-2023-43550" "CVE-2023-52901";
 commentPatches android_kernel_xiaomi_sm8250.sh "CVE-2018-5873" "CVE-2020-1749" "CVE-2021-3444" "CVE-2021-3600" "CVE-2022-22075";
 commentPatches android_kernel_yandex_sdm660.sh "CVE-2019-11599" "CVE-2019-14070/ANY/0005.patch" "CVE-2019-19319" "CVE-2020-1749" "CVE-2020-8992" "CVE-2020-16166" "CVE-2024-35954";
 commentPatches android_kernel_zte_msm8930.sh "CVE-2015-2922" "CVE-2017-11015/prima";

Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh

@@ -801,7 +801,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52885/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52893/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52894/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52900/4.14/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52901/4.14/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52901/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52907/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/4.14/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.14/0008.patch
@@ -810,6 +810,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0775/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22386/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24857/4.14/0009.patch
@@ -984,7 +985,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39296/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39301/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39475/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39480/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39487/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39487/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39488/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39489/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39499/4.14/0009.patch
@@ -1015,7 +1016,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41015/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41016/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41017/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41020/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41035/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41041/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41059/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-41063/4.19/0002.patch
@@ -1032,19 +1033,20 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42090/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42094/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42096/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42097/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42101/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42102/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42105/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42101/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42102/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42105/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42106/4.12-^6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42131/4.19/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42143/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42157/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42224/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42232/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42143/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42157/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42224/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42232/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42265/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42271/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42280/4.19/0002.patch
@@ -1061,14 +1063,15 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43839/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43858/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43861/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43882/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43883/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.14/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47222/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch
-editKernelLocalversion "-dos.p1068"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.14/0009.patch
+editKernelLocalversion "-dos.p1071"
 else echo "kernel_xiaomi_sm6150 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_yandex_sdm660.sh

@@ -884,6 +884,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42310/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42311/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43839/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43858/^6.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43883/^6.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0429/4.4/0012.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.4/0007.patch
@@ -892,7 +893,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37159/4.4/0006.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.4/0001.patch
-editKernelLocalversion "-dos.p892"
+editKernelLocalversion "-dos.p893"
 else echo "kernel_yandex_sdm660 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sdm660.sh

@@ -530,11 +530,12 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42310/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42311/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43839/^6.10/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43858/^6.9/0001.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43883/^6.11/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.4/0004.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.4/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.4/0001.patch
-editKernelLocalversion "-dos.p534"
+editKernelLocalversion "-dos.p535"
 else echo "kernel_xiaomi_sdm660 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"

Scripts/LineageOS-19.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh

@@ -882,7 +882,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52884/^6.5/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52885/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52893/4.14/0003.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52900/4.14/0003.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52901/4.14/0002.patch
+#git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52901/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52907/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0340/4.14/0007.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-0607/4.14/0008.patch
@@ -892,6 +892,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21459/qca-wifi-host-cmn/0001.patch --
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21468/ANY/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-21475/ANY/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22099/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-22386/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-23849/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24855/^6.4/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-24857/4.14/0009.patch
@@ -1064,7 +1065,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39296/^6.9/0001.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39301/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39475/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39480/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39487/4.19/0004.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39487/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39488/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39489/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-39499/4.14/0009.patch
@@ -1111,19 +1112,20 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42090/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42094/4.14/0008.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42096/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42097/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42101/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42102/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42105/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42101/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42102/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42105/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42106/4.12-^6.10/0001.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42115/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42131/4.19/0007.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42143/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42157/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42224/4.19/0002.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42232/4.19/0003.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42143/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42145/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42148/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42154/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42157/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42223/4.14/0009.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42224/4.14/0008.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42232/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42265/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42271/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42280/4.19/0002.patch
@@ -1141,6 +1143,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43858/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43861/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43879/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43882/4.19/0002.patch
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-43883/4.19/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-12819/4.14/0006.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
@@ -1150,8 +1153,8 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47222/4.14/0002.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2023-52601/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/4.14/0009.patch
 git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/4.14/0009.patch
-git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.19/0002.patch
-editKernelLocalversion "-dos.p1151"
+git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/4.14/0009.patch
+editKernelLocalversion "-dos.p1154"
 else echo "kernel_xiaomi_sm8150 is unavailable, not patching.";
 fi;
 cd "$DOS_BUILD_BASE"