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

Commit e840cf31 authored by Akilesh Kailash's avatar Akilesh Kailash Committed by Automerger Merge Worker
Browse files

Merge "libsnapshot: Verify the ordering of COW operations." into main am:... 

Merge "libsnapshot: Verify the ordering of COW operations." into main am: 1db90d0a am: 5eb2c1e8 am: 94a62bb4 am: e4841b7b am: d9726910

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



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

fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp

+25 −0
Original line number Diff line number Diff line
@@ -310,9 +310,34 @@ bool CowReader::PrepMergeOps() { 
bool CowReader::VerifyMergeOps() {

    auto itr = GetMergeOpIter(true);

    std::unordered_map<uint64_t, const CowOperation*> overwritten_blocks;

    bool non_ordered_op_found = false;



    while (!itr->AtEnd()) {

        const auto& op = itr->Get();

        uint64_t offset;



        // Op should not be a metadata

        if (IsMetadataOp(*op)) {

            LOG(ERROR) << "Metadata op: " << op << " found during merge sequence";

            return false;

        }



        // Sequence ops should contain all the ordered ops followed

        // by Replace and Zero ops. If we find the first op which

        // is not ordered, that means all ordered ops processing

        // has been completed.

        if (!IsOrderedOp(*op)) {

            non_ordered_op_found = true;

        }



        // Since, all ordered ops processing has been completed,

        // check that the subsequent ops are not ordered.

        if (non_ordered_op_found && IsOrderedOp(*op)) {

            LOG(ERROR) << "Invalid sequence - non-ordered and ordered ops"

                       << " cannot be mixed during sequence generation";

            return false;

        }



        if (!GetSourceOffset(op, &offset)) {

            itr->Next();

            continue;