Merge "fs_mgr_verity: correct dm_target_spec->next" am: cb199c3fc7 am: 852afd14c8

am: 588e703b76

Change-Id: I860b36dc7848b05627ad794c46137892a54876d6
This commit is contained in:
bowgotsai 2017-01-26 16:25:33 +00:00 committed by android-build-merger
commit 742fc477c9

View file

@ -285,7 +285,7 @@ static int load_verity_table(struct dm_ioctl *io, const std::string &name,
// set next target boundary
verity_params += strlen(verity_params) + 1;
verity_params = (char*)(((unsigned long)verity_params + 7) & ~8);
verity_params = (char*)(((uintptr_t)verity_params + 7) & ~7);
tgt->next = verity_params - buffer;
// send the ioctl to load the verity table