commit aac503ab21232e79eaef4db9f23201072a98bc11
author bowgotsai <bowgotsai@google.com> Thu Jan 26 16:25:33 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 26 16:25:33 2017 +0000
tree 1c0eb49fea961323c3067217927bd09babecca53
parent 3706c30691cf61da869f9360a484166d546fd71b
parent 755e05e2365b62b0e0a459dd5195117474548c47

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

Change-Id: I860b36dc7848b05627ad794c46137892a54876d6

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