diff options
| author | Bill Peckham <bpeckham@google.com> | 2019-03-29 14:57:42 +0100 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-03-29 14:57:42 +0100 |
| commit | 575fc7ec07497bb3e629f4498ddfe996a63c2291 (patch) | |
| tree | 12d2322e0efd74c364df7bb95948bd2f57e1b242 | |
| parent | Merge "Fix bogus error checking on unique_fd" am: a0fe1227b8 am: 7367caad0f (diff) | |
| parent | Merge "Use flags = 0 to avoid fd closing for child updater process" am: 50bda24f1e (diff) | |
| download | android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar.gz android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar.bz2 android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar.lz android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar.xz android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.tar.zst android_bootable_recovery-575fc7ec07497bb3e629f4498ddfe996a63c2291.zip | |
| -rw-r--r-- | install.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/install.cpp b/install.cpp index b7fb78878..ffa39e46b 100644 --- a/install.cpp +++ b/install.cpp @@ -342,7 +342,9 @@ static int try_update_binary(const std::string& package, ZipArchiveHandle zip, b // The updater in child process writes to the pipe to communicate with recovery. android::base::unique_fd pipe_read, pipe_write; - if (!android::base::Pipe(&pipe_read, &pipe_write)) { + // Explicitly disable O_CLOEXEC using 0 as the flags (last) parameter to Pipe + // so that the child updater process will recieve a non-closed fd. + if (!android::base::Pipe(&pipe_read, &pipe_write, 0)) { PLOG(ERROR) << "Failed to create pipe for updater-recovery communication"; return INSTALL_CORRUPT; } |