Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34c1b813 authored by Narayan Kamath's avatar Narayan Kamath
Browse files

Process: Fix communication with zygote. 

Don't write partial requests, and don't return (or throw) early after
partially reading a response.

bug: 30143607

(cherry picked from commit 448be0a6)

Change-Id: Ib283b1620947151338f5f9473891a048a17d8f4a
parent ccd3de69

core/java/android/os/ZygoteProcess.java

+15 −6
Original line number Diff line number Diff line
@@ -237,6 +237,15 @@ public class ZygoteProcess { 
            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.SystemZygoteInit.readArgumentList()

             * Presently the wire format to the zygote process is:
@@ -253,13 +262,8 @@ public class ZygoteProcess { 
            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();

            }
@@ -268,11 +272,16 @@ public class ZygoteProcess { 


            // Should there be a timeout on this?

            Process.ProcessStartResult result = new Process.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();