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

Commit d5cc7ee2 authored by Narayan Kamath's avatar Narayan Kamath Committed by Jessica Wagantall
Browse files

Process: Fix communication with zygote. 

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

CYNGNOS-3286
bug: 30143607

(cherry-picked from commit 448be0a6)

Change-Id: I5881fdd5e81023cd21fb4d23a471a5031987a1f1
(cherry picked from commit e29c6493)
(cherry picked from commit 36b0fb3b)
parent 427a219a

core/java/android/os/Process.java

+15 −6
Original line number Diff line number Diff line
@@ -539,6 +539,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:
@@ -555,13 +564,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();

            }
@@ -570,11 +574,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();