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

Commit 81cc119e authored by Konstantin Vyshetsky's avatar Konstantin Vyshetsky
Browse files

fastbootd: allow passage of flags to open partition 



Allow caller to pass additional flags when opening a partition. Obsolete
usage of boolean read, and make previous callers use O_RDONLY instead.
Explicitly OR (O_EXCL | O_CLOEXEC | O_BINARY) to keep existing design
working as is.

Test: flash locally and reach home screen
Bug: 205151372
Signed-off-by: default avatarKonstantin Vyshetsky <vkon@google.com>
Change-Id: I48fbca459a17fcf0b0926ab339585e3bd8e31e35
parent 52a21351

fastboot/device/commands.cpp

+1 −1
Original line number Diff line number Diff line
@@ -725,7 +725,7 @@ class PartitionFetcher { 
            return false;

        }



        if (!OpenPartition(device_, partition_name_, &handle_, true /* read */)) {

        if (!OpenPartition(device_, partition_name_, &handle_, O_RDONLY)) {

            ret_ = device_->WriteFail(

                    android::base::StringPrintf("Cannot open %s", partition_name_.c_str()));

            return false;

fastboot/device/utility.cpp

+1 −2
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ bool OpenLogicalPartition(FastbootDevice* device, const std::string& partition_n 
}  // namespace



bool OpenPartition(FastbootDevice* device, const std::string& name, PartitionHandle* handle,

                   bool read) {

                   int flags) {

    // We prioritize logical partitions over physical ones, and do this

    // consistently for other partition operations (like getvar:partition-size).

    if (LogicalPartitionExists(device, name)) {
@@ -90,7 +90,6 @@ bool OpenPartition(FastbootDevice* device, const std::string& name, PartitionHan 
        return false;

    }



    int flags = (read ? O_RDONLY : O_WRONLY);

    flags |= (O_EXCL | O_CLOEXEC | O_BINARY);

    unique_fd fd(TEMP_FAILURE_RETRY(open(handle->path().c_str(), flags)));

    if (fd < 0) {

fastboot/device/utility.h

+4 −2
Original line number Diff line number Diff line
@@ -76,9 +76,11 @@ std::optional<std::string> FindPhysicalPartition(const std::string& name); 
bool LogicalPartitionExists(FastbootDevice* device, const std::string& name,

                            bool* is_zero_length = nullptr);



// If read, partition is readonly. Else it is write only.

// Partition is O_WRONLY by default, caller should pass O_RDONLY for reading.

// Caller may pass additional flags if needed. (O_EXCL | O_CLOEXEC | O_BINARY)

// will be logically ORed internally.

bool OpenPartition(FastbootDevice* device, const std::string& name, PartitionHandle* handle,

                   bool read = false);

                   int flags = O_WRONLY);



bool GetSlotNumber(const std::string& slot, android::hardware::boot::V1_0::Slot* number);

std::vector<std::string> ListPartitions(FastbootDevice* device);