diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-20 02:41:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-20 02:41:34 +0000 |
| commit | f0db2406f7d7ea29a8784c951231e3c065c8a5e2 (patch) | |
| tree | 9453fd8714cf88413d01db71738a0bd03a7ed000 /init | |
| parent | 8c7b66629d5e5f99e50708c42d47a23ce1fa5be7 (diff) | |
| parent | e873e1d31b1e43e9c3b95a5e40fec905a0dc78dc (diff) | |
| download | core-f0db2406f7d7ea29a8784c951231e3c065c8a5e2.tar.gz | |
Merge "Null terminate the std::array given to execve" into main
Diffstat (limited to 'init')
| -rw-r--r-- | init/first_stage_mount.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/init/first_stage_mount.cpp b/init/first_stage_mount.cpp index ae216c664..5d3a27354 100644 --- a/init/first_stage_mount.cpp +++ b/init/first_stage_mount.cpp @@ -556,11 +556,11 @@ static bool MaybeDeriveMicrodroidVendorDiceNode(Fstab* fstab) { return true; } // clang-format off - const std::array<const char*, 7> args = { + const std::array<const char*, 8> args = { "/system/bin/derive_microdroid_vendor_dice_node", "--dice-driver", "/dev/open-dice0", "--microdroid-vendor-disk-image", microdroid_vendor_block_dev->data(), - "--output", "/microdroid_resources/dice_chain.raw", + "--output", "/microdroid_resources/dice_chain.raw", nullptr, }; // clang-format-on // ForkExecveAndWaitForCompletion calls waitpid to wait for the fork-ed process to finish. |