Signed-off-by: Tavi <tavi@divested.dev>
This commit is contained in:
Tavi 2024-03-09 11:25:46 -05:00
parent 366140a179
commit 0b8f1a2c57
No known key found for this signature in database
GPG key ID: E599F62ECBAEAF2E
26 changed files with 45 additions and 45 deletions

View file

@ -1,4 +1,4 @@
From ca4c85efdba2b8f4318e34759d4fd8a6bd7c9943 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: kumarashishg <kumarashishg@google.com>
Date: Mon, 17 Jul 2023 12:01:18 +0000
Subject: [PATCH] Resolve custom printer icon boundary exploit.
@ -18,10 +18,10 @@ Change-Id: Ic383eed92b599e5f9aa7f1c4a58135336e8e6e68
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/services/print/java/com/android/server/print/PrintManagerService.java b/services/print/java/com/android/server/print/PrintManagerService.java
index 1feb81664e95c..9dc22162a2c1c 100644
index 1feb81664e95..9dc22162a2c1 100644
--- a/services/print/java/com/android/server/print/PrintManagerService.java
+++ b/services/print/java/com/android/server/print/PrintManagerService.java
@@ -203,12 +203,44 @@ public Icon getCustomPrinterIcon(PrinterId printerId, int userId) {
@@ -203,12 +203,44 @@ public final class PrintManagerService extends SystemService {
}
final long identity = Binder.clearCallingIdentity();
try {

View file

@ -1,4 +1,4 @@
From ace2c7017edeb221b293513497a9b7e4480bfcbd Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dmitry Dementyev <dementyev@google.com>
Date: Wed, 3 Jan 2024 09:26:56 -0800
Subject: [PATCH] Close AccountManagerService.session after timeout.
@ -16,10 +16,10 @@ Change-Id: I39afbe8f4bfc6b652365c798c64328797f27e5d4
1 file changed, 10 insertions(+)
diff --git a/services/core/java/com/android/server/accounts/AccountManagerService.java b/services/core/java/com/android/server/accounts/AccountManagerService.java
index 126955add01a9..ecd642bebb669 100644
index 9069cd7ffe9c..b28e532c01bb 100644
--- a/services/core/java/com/android/server/accounts/AccountManagerService.java
+++ b/services/core/java/com/android/server/accounts/AccountManagerService.java
@@ -180,6 +180,7 @@ public void onUnlockUser(int userHandle) {
@@ -182,6 +182,7 @@ public class AccountManagerService
final MessageHandler mMessageHandler;
@ -27,7 +27,7 @@ index 126955add01a9..ecd642bebb669 100644
// Messages that can be sent on mHandler
private static final int MESSAGE_TIMED_OUT = 3;
private static final int MESSAGE_COPY_SHARED_ACCOUNT = 4;
@@ -4172,6 +4173,7 @@ public Session(UserAccounts accounts, IAccountManagerResponse response, String a
@@ -4202,6 +4203,7 @@ public class AccountManagerService
synchronized (mSessions) {
mSessions.put(toString(), this);
}
@ -35,7 +35,7 @@ index 126955add01a9..ecd642bebb669 100644
if (response != null) {
try {
response.asBinder().linkToDeath(this, 0 /* flags */);
@@ -4279,6 +4281,11 @@ private void unbind() {
@@ -4357,6 +4359,11 @@ public class AccountManagerService
}
}
@ -47,7 +47,7 @@ index 126955add01a9..ecd642bebb669 100644
public void cancelTimeout() {
mMessageHandler.removeMessages(MESSAGE_TIMED_OUT, this);
}
@@ -4315,6 +4322,9 @@ public void onServiceDisconnected(ComponentName name) {
@@ -4393,6 +4400,9 @@ public class AccountManagerService
public void onTimedOut() {
IAccountManagerResponse response = getResponseAndClose();