diff options
author | Narayan Kamath <narayan@google.com> | 2016-08-09 17:00:25 +0100 |
---|---|---|
committer | gitbuildkicker <android-build@google.com> | 2016-08-26 10:40:49 -0700 |
commit | 2c7008421cb67f5d89f16911bdbe36f6c35311ad (patch) | |
tree | 24cb5c7df83e3d96aba23737415ae897fe4f4e3d | |
parent | c372cb67ade0e6b73f00d78abafe6c800f5a9bf2 (diff) | |
download | base-2c7008421cb67f5d89f16911bdbe36f6c35311ad.tar.gz |
Process: Fix communication with zygote.
Don't write partial requests, and don't return (or throw) early after
partially reading a response.
bug: 30143607
Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
(cherry picked from commit 448be0a62209c977593d81617853a8a428d013df)
-rw-r--r-- | core/java/android/os/Process.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/core/java/android/os/Process.java b/core/java/android/os/Process.java index f664e70cf7be..21b3f6ed4582 100644 --- a/core/java/android/os/Process.java +++ b/core/java/android/os/Process.java @@ -559,6 +559,15 @@ public class Process { ZygoteState zygoteState, ArrayList<String> args) throws ZygoteStartFailedEx { try { + // Throw early if any of the arguments are malformed. This means we can + // avoid writing a partial response to the zygote. + int sz = args.size(); + for (int i = 0; i < sz; i++) { + if (args.get(i).indexOf('\n') >= 0) { + throw new ZygoteStartFailedEx("embedded newlines not allowed"); + } + } + /** * See com.android.internal.os.ZygoteInit.readArgumentList() * Presently the wire format to the zygote process is: @@ -575,13 +584,8 @@ public class Process { writer.write(Integer.toString(args.size())); writer.newLine(); - int sz = args.size(); for (int i = 0; i < sz; i++) { String arg = args.get(i); - if (arg.indexOf('\n') >= 0) { - throw new ZygoteStartFailedEx( - "embedded newlines not allowed"); - } writer.write(arg); writer.newLine(); } @@ -590,11 +594,16 @@ public class Process { // Should there be a timeout on this? ProcessStartResult result = new ProcessStartResult(); + + // Always read the entire result from the input stream to avoid leaving + // bytes in the stream for future process starts to accidentally stumble + // upon. result.pid = inputStream.readInt(); + result.usingWrapper = inputStream.readBoolean(); + if (result.pid < 0) { throw new ZygoteStartFailedEx("fork() failed"); } - result.usingWrapper = inputStream.readBoolean(); return result; } catch (IOException ex) { zygoteState.close(); |