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

Commit faa64ee1 authored by Yi-Yo Chiang's avatar Yi-Yo Chiang Committed by Automerger Merge Worker
Browse files

Merge "Fix ubsan error path found by libfstab_fuzzer" am: 6a58c592 

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

Change-Id: I73e7518ccfa7603c36357a589d00d62d9f2eabfa
parents 56c2c2d1 6a58c592

fs_mgr/fs_mgr_fstab.cpp

+4 −2
Original line number Diff line number Diff line
@@ -130,10 +130,12 @@ void ParseMountFlags(const std::string& flags, FstabEntry* entry) { 
            if (auto equal_sign = flag.find('='); equal_sign != std::string::npos) {

                const auto arg = flag.substr(equal_sign + 1);

                if (entry->fs_type == "f2fs" && StartsWith(flag, "reserve_root=")) {

                    if (!ParseInt(arg, &entry->reserved_size)) {

                    off64_t size_in_4k_blocks;

                    if (!ParseInt(arg, &size_in_4k_blocks, static_cast<off64_t>(0),

                                  std::numeric_limits<off64_t>::max() >> 12)) {

                        LWARNING << "Warning: reserve_root= flag malformed: " << arg;

                    } else {

                        entry->reserved_size <<= 12;

                        entry->reserved_size = size_in_4k_blocks << 12;

                    }

                } else if (StartsWith(flag, "lowerdir=")) {

                    entry->lowerdir = std::move(arg);