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

Commit 0f573867 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ifd901bdd276d25dd5f50e5d04184a1c132d016a1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b4aad899 f0db2406

init/first_stage_mount.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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.