commit e3609aa8370858d047e49fa7fc9188eb4bf01800
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 13 18:59:58 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Feb 13 18:59:58 2020 +0000
tree 282579aa1b3b0661c0e8241f3d2e2d3203a14f16
parent aebcc399ea2e3ae2b275c976484bc48f70355ed8
parent 47aff8772db97217ebc6d520289fc36dbebfc4a5

Merge "Use DM layer directly to manage private DM volumes" am: dd12ea5bd2 am: 47aff8772d

Change-Id: Id3af32b4e83fbfc71492d9050b2215a04b7830a9

cryptfs.cpp

diff --git a/cryptfs.cpp b/cryptfs.cpp
index e00165f..c0816ab 100644
--- a/cryptfs.cpp
+++ b/cryptfs.cpp
@@ -1939,14 +1939,6 @@
                                  real_blkdev, out_crypto_blkdev, label, flags);
 }
 
-/*
- * Called by vold when it's asked to unmount an encrypted external
- * storage volume.
- */
-int cryptfs_revert_ext_volume(const char* label) {
-    return delete_crypto_blk_dev(label);
-}
-
 int cryptfs_crypto_complete(void) {
     return do_crypto_complete("/data");
 }

cryptfs.h

diff --git a/cryptfs.h b/cryptfs.h
index 463db7f..9b5eae7 100644
--- a/cryptfs.h
+++ b/cryptfs.h
@@ -66,7 +66,6 @@
 int cryptfs_enable_default(int no_ui);
 int cryptfs_setup_ext_volume(const char* label, const char* real_blkdev,
                              const android::vold::KeyBuffer& key, std::string* out_crypto_blkdev);
-int cryptfs_revert_ext_volume(const char* label);
 int cryptfs_getfield(const char* fieldname, char* value, int len);
 int cryptfs_setfield(const char* fieldname, const char* value);
 int cryptfs_mount_default_encrypted(void);

model/PrivateVolume.cpp

diff --git a/model/PrivateVolume.cpp b/model/PrivateVolume.cpp
index 1653fae..4a0b250 100644
--- a/model/PrivateVolume.cpp
+++ b/model/PrivateVolume.cpp
@@ -25,6 +25,7 @@
 #include <android-base/logging.h>
 #include <android-base/stringprintf.h>
 #include <cutils/fs.h>
+#include <libdm/dm.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>
@@ -66,7 +67,11 @@
     }
 
     // Recover from stale vold by tearing down any old mappings
-    cryptfs_revert_ext_volume(getId().c_str());
+    auto& dm = dm::DeviceMapper::Instance();
+    if (!dm.DeleteDeviceIfExists(getId())) {
+        PLOG(ERROR) << "Cannot remove dm device " << getId();
+        return -EIO;
+    }
 
     // TODO: figure out better SELinux labels for private volumes
 
@@ -80,8 +85,10 @@
 }
 
 status_t PrivateVolume::doDestroy() {
-    if (cryptfs_revert_ext_volume(getId().c_str())) {
-        LOG(ERROR) << getId() << " failed to revert cryptfs";
+    auto& dm = dm::DeviceMapper::Instance();
+    if (!dm.DeleteDevice(getId())) {
+        PLOG(ERROR) << "Cannot remove dm device " << getId();
+        return -EIO;
     }
     return DestroyDeviceNode(mRawDevPath);
 }