commit 92edacf2dc24ac59c967ccb55c6583df2d50a022
author bowgotsai <bowgotsai@google.com> Thu Jan 26 16:19:02 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 16:19:02 2017 +0000
tree 842f6444b02029864c83f724b267d3ae0174b666
parent 06d7ed24968956919ebc7c8078323ca876a71e45
parent f6ed728127902adcd551c2d5a23bc1a6967a4c2b

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

Change-Id: I92b912f75c2589b520cc5ec4c1f94e68abc210e2

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