ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libdm: Redact keys from dm-crypt targets when calling GetTable.

Browse source 
Ignore-AOSP-First: security fix
Bug: 368069390
Test: libdm_test
Change-Id: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
Merged-In: I40b9a0129e58b1a0f116ca29f0ee66f91a27a73d
This commit is contained in:
David Anderson 2024-10-01 11:01:08 -07:00
parent fb73f1789e
commit c434d801d6
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
fs_mgr/libdm/dm.cpp
View file

@ -494,6 +494,17 @@ bool DeviceMapper::GetTableInfo(const std::string& name, std::vector<TargetInfo>
return GetTable(name, DM_STATUS_TABLE_FLAG, table);
}
void RedactTableInfo(const struct dm_target_spec& spec, std::string* data) {
if (DeviceMapper::GetTargetType(spec) == "crypt") {
auto parts = android::base::Split(*data, " ");
if (parts.size() < 2) {
return;
}
parts[1] = "redacted";
*data = android::base::Join(parts, " ");
}
}
// private methods of DeviceMapper
bool DeviceMapper::GetTable(const std::string& name, uint32_t flags,
std::vector<TargetInfo>* table) {
@ -532,6 +543,9 @@ bool DeviceMapper::GetTable(const std::string& name, uint32_t flags,
// Note: we use c_str() to eliminate any extra trailing 0s.
data = std::string(&buffer[data_offset], next_cursor - data_offset).c_str();
}
if (flags & DM_STATUS_TABLE_FLAG) {
RedactTableInfo(*spec, &data);
}
table->emplace_back(*spec, data);
cursor = next_cursor;
}