commit db66b88b9e662a121bb93d2ee9eefd012e8f8a20
author David Anderson <dvander@google.com> Thu Jun 20 14:27:17 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jun 20 14:27:17 2019 -0700
tree 8faab080661cd9100e5c6d0f741b246b75a02125
parent 93c2839fe4bcfa6d32b27e21dd9601757537c06e
parent 1aa20b33bb44f014828fced5879802a5a39119ad

Merge "liblp: Handle invalid alignment offsets correctly."
am: 99f610da3d

Change-Id: Ia2d6150395f4e4705ad8c84d483fe24428ea6cf9

fs_mgr/liblp/partition_opener.cpp

diff --git a/fs_mgr/liblp/partition_opener.cpp b/fs_mgr/liblp/partition_opener.cpp
index 3b12213..cc4a882 100644
--- a/fs_mgr/liblp/partition_opener.cpp
+++ b/fs_mgr/liblp/partition_opener.cpp
@@ -64,6 +64,12 @@
         PERROR << __PRETTY_FUNCTION__ << "BLKALIGNOFF failed on " << block_device;
         return false;
     }
+    // The kernel can return -1 here when misaligned devices are stacked (i.e.
+    // device-mapper).
+    if (alignment_offset == -1) {
+        alignment_offset = 0;
+    }
+
     int logical_block_size;
     if (ioctl(fd, BLKSSZGET, &logical_block_size) < 0) {
         PERROR << __PRETTY_FUNCTION__ << "BLKSSZGET failed on " << block_device;