diff --git a/Misc/aosp-cves/gen_cve_list.sh b/Misc/aosp-cves/gen_cve_list.sh index 34dd8f70..780d145e 100644 --- a/Misc/aosp-cves/gen_cve_list.sh +++ b/Misc/aosp-cves/gen_cve_list.sh @@ -1,5 +1,7 @@ +java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2022-02-01" >> cve_list.txt java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2022-01-01" >> cve_list.txt +java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2022-02-01" >> cve_list.txt java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/pixel/2022-01-01" >> cve_list.txt java -jar $DOS_BINARY_PATCHER scraper "https://source.android.com/security/bulletin/2021-12-01" >> cve_list.txt diff --git a/Patches/Linux b/Patches/Linux index f219b0d6..3ca013d3 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit f219b0d65706fb126c53d5cb4f827e726d31af97 +Subproject commit 3ca013d3618303d8c564adea1b5a4c733d0a7a61 diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index 9c1d0911..e1fe9fb4 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -88,8 +88,7 @@ patchWorkspace() { touch DOS_PATCHED_FLAG; if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi; - source build/envsetup.sh; - repopick -it O_asb_2022-01; + #source build/envsetup.sh; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 840e37f6..37079cf9 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -325,6 +325,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30335/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch @@ -361,5 +362,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p361" +editKernelLocalversion "-dos.p362" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index 092c11aa..7f628197 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -428,6 +428,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -462,5 +463,5 @@ 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.p462" +editKernelLocalversion "-dos.p463" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh index 5ceacc42..a7955316 100644 --- a/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh +++ b/Scripts/LineageOS-17.1/CVE_Patchers/android_kernel_xiaomi_sm6150.sh @@ -180,6 +180,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -214,5 +215,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p214" +editKernelLocalversion "-dos.p215" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh index 9c074e3d..e61b9ba9 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_fairphone_sdm632.sh @@ -285,6 +285,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.9/0004.patch @@ -328,5 +329,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/4.9/0011.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.9/0005.patch -editKernelLocalversion "-dos.p328" +editKernelLocalversion "-dos.p329" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh index e891f339..9fe52b3f 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_coral.sh @@ -177,6 +177,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -211,5 +212,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p211" +editKernelLocalversion "-dos.p212" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh index 0ae06015..aef8c11d 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_msm-4.9.sh @@ -184,6 +184,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29647/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.9/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30335/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.9/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.9/0004.patch @@ -213,5 +214,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.9/0009.patch -editKernelLocalversion "-dos.p213" +editKernelLocalversion "-dos.p214" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh index 9875e320..7854e36e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_sunfish.sh @@ -174,6 +174,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -208,5 +209,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45485/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45486/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0322/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-24586/4.14/0003.patch -editKernelLocalversion "-dos.p208" +editKernelLocalversion "-dos.p209" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh index 64739877..1f3a6c04 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_google_wahoo.sh @@ -69,6 +69,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-11608/^5.6.1/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-14386/3.10-^4.4/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-16119/^5.10/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-1963/ANY/0003.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.4/0004.patch -editKernelLocalversion "-dos.p70" +editKernelLocalversion "-dos.p71" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh index bf7e998a..448bbeae 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_msm8996.sh @@ -425,6 +425,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29154/4.4/0006.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-29650/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30002/3.18/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30319/qcacld-2.0/0002.patch --directory=drivers/staging/qcacld-2.0 +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30337/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/3.18/0008.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/3.18/0008.patch @@ -442,5 +443,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2019-14283/3.18/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-0466/3.18/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-26145/qcacld-2.0/0008.patch --directory=drivers/staging/qcacld-2.0 git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/3.18/0007.patch -editKernelLocalversion "-dos.p442" +editKernelLocalversion "-dos.p443" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh index 92581f49..9f334bfa 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sdm845.sh @@ -96,6 +96,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28714/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-28715/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33033/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/^5.12/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35069/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38199/4.9/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-39685/4.9/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-40490/3.9-^5.14/0001.patch @@ -104,5 +105,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-43976/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45095/4.9/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-45469/4.9-^5.16/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2022-0330/4.9/0005.patch -editKernelLocalversion "-dos.p104" +editKernelLocalversion "-dos.p105" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh index f13ae966..9d69f5f8 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_oneplus_sm8150.sh @@ -234,6 +234,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -243,6 +244,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34981/^5.13/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35069/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38198/4.14/0002.patch @@ -272,5 +274,5 @@ 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.p272" +editKernelLocalversion "-dos.p274" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh index 6847f314..0616618e 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8150.sh @@ -271,6 +271,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30262/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30265/ANY/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30316/ANY/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-30324/ANY/0001.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31829/4.14/0009.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-31916/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-32399/4.14/0002.patch @@ -280,6 +281,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33098/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-33909/4.14/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.14/0004.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34981/^5.13/0001.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35069/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.14/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38198/4.14/0002.patch @@ -308,5 +310,5 @@ 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.p308" +editKernelLocalversion "-dos.p310" cd "$DOS_BUILD_BASE" diff --git a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh index e3c9f1ba..e0d0d2b5 100644 --- a/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh +++ b/Scripts/LineageOS-18.1/CVE_Patchers/android_kernel_xiaomi_sm8250.sh @@ -321,6 +321,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34556/4.19/0007.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34693/4.19/0005.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-34981/4.19/0002.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35039/4.19/0002.patch +git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-35069/qca-wifi-host-cmn/0001.patch --directory=drivers/staging/qca-wifi-host-cmn git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-37576/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38160/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-38198/4.19/0003.patch @@ -357,5 +358,5 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-27830/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2020-29660/4.19/0003.patch git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3428/4.19/0011.patch #git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-3444/^5.11/0001.patch -editKernelLocalversion "-dos.p357" +editKernelLocalversion "-dos.p358" cd "$DOS_BUILD_BASE"