commit 755e05e2365b62b0e0a459dd5195117474548c47
author bowgotsai <bowgotsai@google.com> Thu Jan 26 16:22:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 16:22:32 2017 +0000
tree a47268fdbf09e1682e4ce71af4b4aba606c5ede4
parent aaa85d83c4a5020d9c21940517155ac8aeb6d50d
parent 92edacf2dc24ac59c967ccb55c6583df2d50a022

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

Change-Id: I443b4eb3e1fb1225e3d6a346ccbbf5cbda88df04

fs_mgr/fs_mgr_verity.cpp

diff --git a/fs_mgr/fs_mgr_verity.cpp b/fs_mgr/fs_mgr_verity.cpp
index e368a82..f6a14da 100644
--- a/fs_mgr/fs_mgr_verity.cpp
+++ b/fs_mgr/fs_mgr_verity.cpp
@@ -285,7 +285,7 @@
 
     // 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