openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "fs_mgr: Ignore invalid DT device nodes" 

am: d457091c3d

Change-Id: Ib67d4a15d1076fd13f5dab572107499cd40bbe9c
This commit is contained in:
Tom Marshall 2018-03-09 02:30:58 +00:00 committed by android-build-merger
parent 7bf9de633f d457091c3d
commit cf299d4a66
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs_mgr/fs_mgr_fstab.cpp
View File

@ -33,6 +33,8 @@
#include "fs_mgr_priv.h"
using android::base::StartsWith;
const std::string kDefaultAndroidDtDir("/proc/device-tree/firmware/android");
struct fs_mgr_flag_values {
@ -439,6 +441,10 @@ static std::string read_fstab_from_dt() {
LERROR << "dt_fstab: Failed to find device for partition " << dp->d_name;
return {};
}
if (!StartsWith(value, "/dev")) {
LERROR << "dt_fstab: Invalid device node for partition " << dp->d_name;
return {};
}
fstab_entry.push_back(value);
std::string mount_point;