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

Merge "Fix ubsan error path found by libfstab_fuzzer"

Browse source
This commit is contained in:
Yi-Yo Chiang 2021-10-27 12:08:12 +00:00 committed by Gerrit Code Review
commit 6a58c59269
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fs_mgr/fs_mgr_fstab.cpp
View file

@ -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);