Update CVE patchers

maybe breakage

Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-10-09 12:35:48 -04:00
parent 0af36393f5
commit 48f5e5dd63
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
64 changed files with 897 additions and 366 deletions

View file

@ -1,4 +1,4 @@
From 560e0b6265e67b7a1f5e63da097e27485ba65a8f Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: William Loh <wloh@google.com>
Date: Mon, 3 Jun 2024 12:56:47 -0700
Subject: [PATCH] Fail parseUri if end is missing
@ -12,10 +12,10 @@ Change-Id: I5f619ced684ff505ce2b7408cd35dd3e9be89dea
1 file changed, 3 insertions(+)
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
index 2142aae2ec74a..6c93c4651cec5 100644
index 0059f9edb6e1..4c1f22472b10 100644
--- a/core/java/android/content/Intent.java
+++ b/core/java/android/content/Intent.java
@@ -5112,6 +5112,9 @@ public static Intent parseUri(String uri, int flags) throws URISyntaxException {
@@ -5112,6 +5112,9 @@ public class Intent implements Parcelable, Cloneable {
int eq = uri.indexOf('=', i);
if (eq < 0) eq = i-1;
int semi = uri.indexOf(';', i);

View file

@ -1,4 +1,4 @@
From 9fa4be80e24143b7b7a382659ccb260f129084c1 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Thu, 11 Jul 2024 12:39:22 -0700
Subject: [PATCH] Update AccountManagerService checkKeyIntent.
@ -17,10 +17,10 @@ Change-Id: I8b23191d3d60036ca7ddf0ef7dcba6b38fb27b3c
1 file changed, 3 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 4804050c721f2..56e43b8025c87 100644
index 77fd4a8d6054..ce98ce412aaa 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -4220,6 +4220,9 @@ protected boolean checkKeyIntent(int authUid, Intent intent) {
@@ -4258,6 +4258,9 @@ public class AccountManagerService
if (resolveInfo == null) {
return false;
}

View file

@ -1,4 +1,4 @@
From 25bff2717051677d510eed49e5825123682ea19a Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Almaz Mingaleev <mingaleev@google.com>
Date: Wed, 10 Jul 2024 13:38:35 +0100
Subject: [PATCH] Do not accept zip files with invalid headers.

@ -1 +1 @@
Subproject commit 2a4bbec2264565e30e0f1df51aa9ea004eb05a1b
Subproject commit 6ef73c2620701831e01136b29b97a78f3cf4af54