Update CVE patchers

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-11-22 11:59:28 -05:00
parent 0f9ad5aeaf
commit 44836b8d2e
No known key found for this signature in database
GPG Key ID: E599F62ECBAEAF2E
5 changed files with 8 additions and 5 deletions

View File

@ -13,7 +13,7 @@ Change-Id: I62c2553c8877b946d7e7e1ca4ef113f963d3f8eb
1 file changed, 46 insertions(+)
diff --git a/services/core/java/com/android/server/connectivity/Vpn.java b/services/core/java/com/android/server/connectivity/Vpn.java
index 8510de4ef201..f444bc22a026 100644
index 8510de4ef201..b8426bdc129d 100644
--- a/services/core/java/com/android/server/connectivity/Vpn.java
+++ b/services/core/java/com/android/server/connectivity/Vpn.java
@@ -47,9 +47,11 @@ import android.content.Intent;

@ -1 +1 @@
Subproject commit 5941b511a3bc2a3b185ec091921d473c752b9777
Subproject commit cec752490d93292e5adf5ca074259a053e0497d9

View File

@ -1269,6 +1269,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53057/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53060/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53061/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53066/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53091/^6.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47195/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47490/5.10/0002.patch
@ -1281,7 +1282,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-49881/5.10/0002.patch
editKernelLocalversion "-dos.p1281"
editKernelLocalversion "-dos.p1282"
else echo "kernel_google_gs101_private_gs-google is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

View File

@ -1267,6 +1267,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53057/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53060/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53061/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53066/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53091/^6.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47195/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/5.10/0007.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47490/5.10/0002.patch
@ -1279,7 +1280,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.10/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.10/0003.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-49881/5.10/0002.patch
editKernelLocalversion "-dos.p1279"
editKernelLocalversion "-dos.p1280"
else echo "kernel_google_gs201_private_gs-google is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"

View File

@ -784,6 +784,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53060/5.4/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53061/5.4/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53063/5.4/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53066/5.4/0005.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-53091/^6.12/0001.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47195/5.4/0004.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47472/5.4/0008.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2021-47490/5.4/0003.patch
@ -796,7 +797,7 @@ git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27424/5.4/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-27425/5.4/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-35812/5.4/0006.patch
git apply $DOS_PATCHES_LINUX_CVES/CVE-2024-42104/5.4/0005.patch
editKernelLocalversion "-dos.p796"
editKernelLocalversion "-dos.p797"
else echo "kernel_oneplus_sm8350 is unavailable, not patching.";
fi;
cd "$DOS_BUILD_BASE"