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

fs_mgr: update block device reference in verity metadata

Browse source 
The dm-verity metadata contains the block device path that is given to
the dm-android-verity driver.  If the device is using slot A/B, this
path is missing the slot suffix.

This patch makes fs_mgr replace all the block device path reference
with the one including the active slot suffix.

Change-Id: Ib624d0d18b12a8a287cac7f15605a2e0fb7c97c6
Signed-off-by: Jeremy Compostella <jeremy.compostella@intel.com>

Bug: 28845874
This commit is contained in:
Jeremy Compostella 2016-04-26 13:51:27 +02:00 • committed by Nick Desaulniers
parent b598abf175
commit 32cabf25aa
1 changed files with 47 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
fs_mgr/fs_mgr_verity.cpp
View file

@ -30,7 +30,7 @@
#include <time.h>
#include <android-base/file.h>
#include <private/android_filesystem_config.h>
#include <android-base/strings.h>
#include <cutils/properties.h>
#include <logwrap/logwrap.h>
@ -217,7 +217,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;
@ -849,15 +849,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;
@ -918,6 +945,15 @@ 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, verity.table,
verity.table_length) < 0) {
@ -928,20 +964,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) {
@ -1007,7 +1041,7 @@ out:
}
fec_close(f);
free(invalid_table);
free(params.table);
free(verity_blk_name);
return retval;