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: update block device reference in verity metadata" am: 4cefb91611 am: 30c9aed0be 

am: 348f3590f0

* commit '348f3590f0c758916f7c27d47b00d40e609baf63':
  fs_mgr: update block device reference in verity metadata

Change-Id: Ie8dcf633b193afd63803d8a0390cf203bda8857d
This commit is contained in:
Jeremy Compostella 2016-05-16 18:16:38 +00:00 committed by android-build-merger
parent 07d0a44e08 348f3590f0
commit 981925e6d2
1 changed files with 48 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
fs_mgr/fs_mgr_verity.cpp
View File

@ -30,6 +30,7 @@
#include <unistd.h>
#include <android-base/file.h>
#include <android-base/strings.h>
#include <crypto_utils/android_pubkey.h>
#include <cutils/properties.h>
#include <logwrap/logwrap.h>
@ -211,7 +212,7 @@ static int get_verity_device_name(struct dm_ioctl *io, char *name, int fd, char
}
struct verity_table_params {
const char *table;
char *table;
int mode;
struct fec_ecc_metadata ecc;
const char *ecc_dev;
@ -843,15 +844,42 @@ out:
return rc;
}
static void update_verity_table_blk_device(char *blk_device, char **table)
{
std::string result, word;
auto tokens = android::base::Split(*table, " ");
for (const auto token : tokens) {
if (android::base::StartsWith(token, "/dev/block/") &&
android::base::StartsWith(blk_device, token.c_str())) {
word = blk_device;
} else {
word = token;
}
if (result.empty()) {
result = word;
} else {
result += " " + word;
}
}
if (result.empty()) {
return;
}
free(*table);
*table = strdup(result.c_str());
}
int fs_mgr_setup_verity(struct fstab_rec *fstab)
{
int retval = FS_MGR_SETUP_VERITY_FAIL;
int fd = -1;
char *invalid_table = NULL;
char *verity_blk_name = NULL;
struct fec_handle *f = NULL;
struct fec_verity_metadata verity;
struct verity_table_params params;
struct verity_table_params params = { .table = NULL };
alignas(dm_ioctl) char buffer[DM_BUF_SIZE];
struct dm_ioctl *io = (struct dm_ioctl *) buffer;
@ -912,8 +940,17 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab)
params.mode = VERITY_MODE_EIO;
}
if (!verity.table) {
goto out;
}
params.table = strdup(verity.table);
if (!params.table) {
goto out;
}
// verify the signature on the table
if (verify_table(verity.signature, sizeof(verity.signature), verity.table,
if (verify_table(verity.signature, sizeof(verity.signature), params.table,
verity.table_length) < 0) {
if (params.mode == VERITY_MODE_LOGGING) {
// the user has been warned, allow mounting without dm-verity
@ -922,20 +959,18 @@ int fs_mgr_setup_verity(struct fstab_rec *fstab)
}
// invalidate root hash and salt to trigger device-specific recovery
invalid_table = strdup(verity.table);
if (!invalid_table ||
invalidate_table(invalid_table, verity.table_length) < 0) {
if (invalidate_table(params.table, verity.table_length) < 0) {
goto out;
}
params.table = invalid_table;
} else {
params.table = verity.table;
}
INFO("Enabling dm-verity for %s (mode %d)\n", mount_point, params.mode);
if (fstab->fs_mgr_flags & MF_SLOTSELECT) {
// Update the verity params using the actual block device path
update_verity_table_blk_device(fstab->blk_device, &params.table);
}
// load the verity mapping table
if (load_verity_table(io, mount_point, verity.data_size, fd, &params,
format_verity_table) == 0) {
@ -1001,7 +1036,7 @@ out:
}
fec_close(f);
free(invalid_table);
free(params.table);
free(verity_blk_name);
return retval;