From 556cc034e359fd1bb64a1b16ebe7a61f06810bcb Mon Sep 17 00:00:00 2001 From: Hans Boehm Date: Tue, 2 Jan 2024 16:53:13 -0800 Subject: [PATCH] [BACKPORT] 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/Process.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index 1e084529de6e5..de8287baa828b 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -578,6 +578,8 @@ private static 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"); } }