diff options
author | Sandeep Patil | 2018-07-23 17:24:55 -0500 |
---|---|---|
committer | Sandeep Patil | 2018-07-23 17:24:55 -0500 |
commit | efc54790859ee672b317692690461b7e0f0e47b3 (patch) | |
tree | b763814bb43b417555cef14aaf45516a88a80a7e | |
parent | 0d469de9a03f2f587ba2c6323b9706b689e6f599 (diff) | |
download | platform-system-core-efc54790859ee672b317692690461b7e0f0e47b3.tar.gz platform-system-core-efc54790859ee672b317692690461b7e0f0e47b3.tar.xz platform-system-core-efc54790859ee672b317692690461b7e0f0e47b3.zip |
fs_mgr: libdm: add support android-verity target.
The support for android-verity makes it possible for us to test
raw verified filesystem images to be attached to android-verity
target and have it verified by the kernel.
This makes the testing of android-verity device mapper target
much easier as it doesn't _have_ to be used for root mount.
Bug: 72722987
Test:
$ losetup /dev/block/loop0 /data/local/tmp/verity_fs.img
$ dmctl create verity-fs android-verity 0 4200 \
Android:7e4333f9bba00adfe0ede979e28ed1920492b40f 7:0
Change-Id: Ica6bf5c6e1fd758fdb4005fc8a09755f369a8a0f
Signed-off-by: Sandeep Patil <sspatil@google.com>
-rw-r--r-- | fs_mgr/libdm/dm_target.cpp | 4 | ||||
-rw-r--r-- | fs_mgr/libdm/include/libdm/dm_target.h | 14 | ||||
-rw-r--r-- | fs_mgr/tools/dmctl.cpp | 11 |
3 files changed, 29 insertions, 0 deletions
diff --git a/fs_mgr/libdm/dm_target.cpp b/fs_mgr/libdm/dm_target.cpp index 20b26df37..7c1826766 100644 --- a/fs_mgr/libdm/dm_target.cpp +++ b/fs_mgr/libdm/dm_target.cpp | |||
@@ -111,5 +111,9 @@ std::string DmTargetVerity::GetParameterString() const { | |||
111 | return base + " " + std::to_string(optional_args_.size()) + " " + optional; | 111 | return base + " " + std::to_string(optional_args_.size()) + " " + optional; |
112 | } | 112 | } |
113 | 113 | ||
114 | std::string DmTargetAndroidVerity::GetParameterString() const { | ||
115 | return keyid_ + " " + block_device_; | ||
116 | } | ||
117 | |||
114 | } // namespace dm | 118 | } // namespace dm |
115 | } // namespace android | 119 | } // namespace android |
diff --git a/fs_mgr/libdm/include/libdm/dm_target.h b/fs_mgr/libdm/include/libdm/dm_target.h index d5974f4f1..31863c8fa 100644 --- a/fs_mgr/libdm/include/libdm/dm_target.h +++ b/fs_mgr/libdm/include/libdm/dm_target.h | |||
@@ -128,6 +128,20 @@ class DmTargetVerity final : public DmTarget { | |||
128 | bool valid_; | 128 | bool valid_; |
129 | }; | 129 | }; |
130 | 130 | ||
131 | class DmTargetAndroidVerity final : public DmTarget { | ||
132 | public: | ||
133 | DmTargetAndroidVerity(uint64_t start, uint64_t length, const std::string& block_device, | ||
134 | const std::string& keyid) | ||
135 | : DmTarget(start, length), keyid_(keyid), block_device_(block_device) {} | ||
136 | |||
137 | std::string name() const override { return "android-verity"; } | ||
138 | std::string GetParameterString() const override; | ||
139 | |||
140 | private: | ||
141 | std::string keyid_; | ||
142 | std::string block_device_; | ||
143 | }; | ||
144 | |||
131 | // This is the same as DmTargetVerity, but the table may be specified as a raw | 145 | // This is the same as DmTargetVerity, but the table may be specified as a raw |
132 | // string. This code exists only for fs_mgr_verity and should be avoided. Use | 146 | // string. This code exists only for fs_mgr_verity and should be avoided. Use |
133 | // DmTargetVerity for new code instead. | 147 | // DmTargetVerity for new code instead. |
diff --git a/fs_mgr/tools/dmctl.cpp b/fs_mgr/tools/dmctl.cpp index 32cbb32ee..45a81af2d 100644 --- a/fs_mgr/tools/dmctl.cpp +++ b/fs_mgr/tools/dmctl.cpp | |||
@@ -40,6 +40,7 @@ using DmTable = ::android::dm::DmTable; | |||
40 | using DmTarget = ::android::dm::DmTarget; | 40 | using DmTarget = ::android::dm::DmTarget; |
41 | using DmTargetLinear = ::android::dm::DmTargetLinear; | 41 | using DmTargetLinear = ::android::dm::DmTargetLinear; |
42 | using DmTargetZero = ::android::dm::DmTargetZero; | 42 | using DmTargetZero = ::android::dm::DmTargetZero; |
43 | using DmTargetAndroidVerity = ::android::dm::DmTargetAndroidVerity; | ||
43 | using DmTargetTypeInfo = ::android::dm::DmTargetTypeInfo; | 44 | using DmTargetTypeInfo = ::android::dm::DmTargetTypeInfo; |
44 | using DmBlockDevice = ::android::dm::DeviceMapper::DmBlockDevice; | 45 | using DmBlockDevice = ::android::dm::DeviceMapper::DmBlockDevice; |
45 | 46 | ||
@@ -96,6 +97,16 @@ class TargetParser final { | |||
96 | } | 97 | } |
97 | return std::make_unique<DmTargetLinear>(start_sector, num_sectors, block_device, | 98 | return std::make_unique<DmTargetLinear>(start_sector, num_sectors, block_device, |
98 | physical_sector); | 99 | physical_sector); |
100 | } else if (target_type == "android-verity") { | ||
101 | if (!HasArgs(2)) { | ||
102 | std::cerr << "Expected \"android-verity\" <public-key-id> <block_device>" | ||
103 | << std::endl; | ||
104 | return nullptr; | ||
105 | } | ||
106 | std::string keyid = NextArg(); | ||
107 | std::string block_device = NextArg(); | ||
108 | return std::make_unique<DmTargetAndroidVerity>(start_sector, num_sectors, keyid, | ||
109 | block_device); | ||
99 | } else { | 110 | } else { |
100 | std::cerr << "Unrecognized target type: " << target_type << std::endl; | 111 | std::cerr << "Unrecognized target type: " << target_type << std::endl; |
101 | return nullptr; | 112 | return nullptr; |