Merge "Null terminate the std::array given to execve" into main

This commit is contained in:
Treehugger Robot 2024-04-20 02:41:34 +00:00 committed by Gerrit Code Review
commit f0db2406f7

View file

@ -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.