mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 01:35:54 -04:00
33 lines
1.5 KiB
Diff
33 lines
1.5 KiB
Diff
From 00ff56bb646c525192f06cbeed96c3dc78d45795 Mon Sep 17 00:00:00 2001
|
|
From: Hans Boehm <hboehm@google.com>
|
|
Date: Tue, 2 Jan 2024 16:53:13 -0800
|
|
Subject: [PATCH] Check hidden API exemptions
|
|
|
|
Refuse to deal with newlines and null characters in
|
|
HiddenApiSettings.update(). Also disallow nulls in process start
|
|
arguments.
|
|
|
|
Bug: 316153291
|
|
Test: Treehugger for now
|
|
(cherry picked from commit 7ba059e2cf0a2c20f9a849719cdc32b12c933a44)
|
|
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:60669aa49aba34c0950d6246bd95b54f91a3c8e8)
|
|
Merged-In: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
|
|
Change-Id: I83cd60e46407a4a082f9f3c80e937dbd522dbac4
|
|
---
|
|
core/java/android/os/ZygoteProcess.java | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/core/java/android/os/ZygoteProcess.java b/core/java/android/os/ZygoteProcess.java
|
|
index 904ec46859fa4..aab1d9d578031 100644
|
|
--- a/core/java/android/os/ZygoteProcess.java
|
|
+++ b/core/java/android/os/ZygoteProcess.java
|
|
@@ -292,6 +292,8 @@ private static Process.ProcessStartResult zygoteSendArgsAndGetResult(
|
|
throw new ZygoteStartFailedEx("Embedded newlines not allowed");
|
|
} else if (args.get(i).indexOf('\r') >= 0) {
|
|
throw new ZygoteStartFailedEx("Embedded carriage returns not allowed");
|
|
+ } else if (args.get(i).indexOf('\u0000') >= 0) {
|
|
+ throw new ZygoteStartFailedEx("Embedded nulls not allowed");
|
|
}
|
|
}
|
|
|