tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/3049294

Change-Id: Ifd901bdd276d25dd5f50e5d04184a1c132d016a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-20 03:02:57 +00:00 committed by Automerger Merge Worker
commit 0f57386772
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
init/first_stage_mount.cpp
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.