Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1b264f1 authored by Paul Crowley's avatar Paul Crowley
Browse files

Add support for v2 of dm-default-key 

Version 2 of dm-default-key has an extra parameter and always sets the
DUN.

Bug: 147814592
Test: Cuttlefish boots with keydirectory flag
Test: Crosshatch formatted before this change boots after it
Change-Id: I309bcc3f907a6df745f5c073b0017a7dd5b5354b
parent 60a55d91

fs_mgr/libdm/dm_target.cpp

+30 −2
Original line number Original line Diff line number Diff line
@@ -243,16 +243,44 @@ std::string DmTargetCrypt::GetParameterString() const { 
    return android::base::Join(argv, " ");

    return android::base::Join(argv, " ");

}

}





const std::string DmTargetDefaultKey::name_ = "default-key";



bool DmTargetDefaultKey::IsLegacy(bool* result) {

    DeviceMapper& dm = DeviceMapper::Instance();

    DmTargetTypeInfo info;

    if (!dm.GetTargetByName(name_, &info)) return false;

    // dm-default-key was modified to be like dm-crypt with version 2

    *result = !info.IsAtLeast(2, 0, 0);

    return true;

}



bool DmTargetDefaultKey::Valid() const {

    bool real_is_legacy;

    if (!DmTargetDefaultKey::IsLegacy(&real_is_legacy)) return false;

    if (real_is_legacy != is_legacy_) return false;

    if (!is_legacy_ && !set_dun_) return false;

    return true;

}



std::string DmTargetDefaultKey::GetParameterString() const {

std::string DmTargetDefaultKey::GetParameterString() const {

    std::vector<std::string> argv;

    std::vector<std::string> argv;

    argv.emplace_back(cipher_);

    argv.emplace_back(cipher_);

    argv.emplace_back(key_);

    argv.emplace_back(key_);

    if (!is_legacy_) {

        argv.emplace_back("0");  // iv_offset

    }

    argv.emplace_back(blockdev_);

    argv.emplace_back(blockdev_);

    argv.push_back(std::to_string(start_sector_));

    argv.push_back(std::to_string(start_sector_));

    std::vector<std::string> extra_argv;

    std::vector<std::string> extra_argv;

    if (set_dun_) {

    if (is_legacy_) {

        if (set_dun_) {  // v2 always sets the DUN.

            extra_argv.emplace_back("set_dun");

            extra_argv.emplace_back("set_dun");

        }

        }

    } else {

        extra_argv.emplace_back("allow_discards");

        extra_argv.emplace_back("sector_size:4096");

        extra_argv.emplace_back("iv_large_sectors");

    }

    if (!extra_argv.empty()) {

    if (!extra_argv.empty()) {

        argv.emplace_back(std::to_string(extra_argv.size()));

        argv.emplace_back(std::to_string(extra_argv.size()));

        argv.insert(argv.end(), extra_argv.begin(), extra_argv.end());

        argv.insert(argv.end(), extra_argv.begin(), extra_argv.end());

fs_mgr/libdm/dm_test.cpp

+17 −2
Original line number Original line Diff line number Diff line
@@ -516,10 +516,25 @@ TEST(libdm, CryptArgs) { 
}

}





TEST(libdm, DefaultKeyArgs) {

TEST(libdm, DefaultKeyArgs) {

    DmTargetDefaultKey target(0, 4096, "AES-256-XTS", "abcdef0123456789", "/dev/loop0", 0);

    DmTargetTypeInfo info;



    DeviceMapper& dm = DeviceMapper::Instance();

    if (!dm.GetTargetByName("default-key", &info)) {

        cout << "default-key module not enabled; skipping test" << std::endl;

        return;

    }

    bool is_legacy;

    ASSERT_TRUE(DmTargetDefaultKey::IsLegacy(&is_legacy));

    // set_dun only in the non-is_legacy case

    DmTargetDefaultKey target(0, 4096, "AES-256-XTS", "abcdef0123456789", "/dev/loop0", 0,

                              is_legacy, !is_legacy);

    ASSERT_EQ(target.name(), "default-key");

    ASSERT_EQ(target.name(), "default-key");

    ASSERT_TRUE(target.Valid());

    ASSERT_TRUE(target.Valid());

    if (is_legacy) {

        ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 /dev/loop0 0");

        ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 /dev/loop0 0");

    } else {

        ASSERT_EQ(target.GetParameterString(), "AES-256-XTS abcdef0123456789 0 /dev/loop0 0");

    }

}

}





TEST(libdm, DeleteDeviceWithTimeout) {

TEST(libdm, DeleteDeviceWithTimeout) {

fs_mgr/libdm/include/libdm/dm_target.h

+7 −3
Original line number Original line Diff line number Diff line
@@ -281,23 +281,27 @@ class DmTargetDefaultKey final : public DmTarget { 
  public:

  public:

    DmTargetDefaultKey(uint64_t start, uint64_t length, const std::string& cipher,

    DmTargetDefaultKey(uint64_t start, uint64_t length, const std::string& cipher,

                       const std::string& key, const std::string& blockdev, uint64_t start_sector,

                       const std::string& key, const std::string& blockdev, uint64_t start_sector,

                       bool set_dun = false)

                       bool is_legacy, bool set_dun)

        : DmTarget(start, length),

        : DmTarget(start, length),

          cipher_(cipher),

          cipher_(cipher),

          key_(key),

          key_(key),

          blockdev_(blockdev),

          blockdev_(blockdev),

          start_sector_(start_sector),

          start_sector_(start_sector),

          is_legacy_(is_legacy),

          set_dun_(set_dun) {}

          set_dun_(set_dun) {}





    std::string name() const override { return "default-key"; }

    std::string name() const override { return name_; }

    bool Valid() const override { return true; }

    bool Valid() const override;

    std::string GetParameterString() const override;

    std::string GetParameterString() const override;

    static bool IsLegacy(bool* result);





  private:

  private:

    static const std::string name_;

    std::string cipher_;

    std::string cipher_;

    std::string key_;

    std::string key_;

    std::string blockdev_;

    std::string blockdev_;

    uint64_t start_sector_;

    uint64_t start_sector_;

    bool is_legacy_;

    bool set_dun_;

    bool set_dun_;

};

};