PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch to <android-base/unique_fd.h>.

Browse Source 
Change-Id: I13ba3f40bd52b5f3e3fe9002a45a9a8630040129
This commit is contained in:
Elliott Hughes
2016-03-22 20:19:22 -07:00
parent 2dbd06c7ed
commit bcabd09293
4 changed files with 74 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
uncrypt/uncrypt.cpp
View File

@@ -61,6 +61,7 @@
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
#include <android-base/strings.h>
#include <android-base/unique_fd.h>
#include <cutils/android_reboot.h>
#include <cutils/properties.h>
#include <fs_mgr.h>
@@ -69,7 +70,6 @@
#include <log/log.h>
#include "bootloader.h"
#include "unique_fd.h"
#define WINDOW_SIZE 5
@@ -174,8 +174,9 @@ static int produce_block_map(const char* path, const char* map_file, const char*
return -1;
}
std::string tmp_map_file = std::string(map_file) + ".tmp";
unique_fd mapfd(open(tmp_map_file.c_str(), O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR));
if (!mapfd) {
android::base::unique_fd mapfd(open(tmp_map_file.c_str(),
O_WRONLY | O_CREAT, S_IRUSR | S_IWUSR));
if (mapfd == -1) {
ALOGE("failed to open %s: %s\n", tmp_map_file.c_str(), strerror(errno));
return -1;
}
@@ -201,7 +202,7 @@ static int produce_block_map(const char* path, const char* map_file, const char*
std::string s = android::base::StringPrintf("%s\n%" PRId64 " %ld\n",
blk_dev, sb.st_size, static_cast<long>(sb.st_blksize));
if (!android::base::WriteStringToFd(s, mapfd.get())) {
if (!android::base::WriteStringToFd(s, mapfd)) {
ALOGE("failed to write %s: %s", tmp_map_file.c_str(), strerror(errno));
return -1;
}
@@ -213,16 +214,16 @@ static int produce_block_map(const char* path, const char* map_file, const char*
int head_block = 0;
int head = 0, tail = 0;
unique_fd fd(open(path, O_RDONLY));
if (!fd) {
android::base::unique_fd fd(open(path, O_RDONLY));
if (fd == -1) {
ALOGE("failed to open %s for reading: %s", path, strerror(errno));
return -1;
}
unique_fd wfd(-1);
android::base::unique_fd wfd;
if (encrypted) {
wfd = open(blk_dev, O_WRONLY);
if (!wfd) {
wfd.reset(open(blk_dev, O_WRONLY));
if (wfd == -1) {
ALOGE("failed to open fd for writing: %s", strerror(errno));
return -1;
}
@@ -241,14 +242,14 @@ static int produce_block_map(const char* path, const char* map_file, const char*
if ((tail+1) % WINDOW_SIZE == head) {
// write out head buffer
int block = head_block;
if (ioctl(fd.get(), FIBMAP, &block) != 0) {
if (ioctl(fd, FIBMAP, &block) != 0) {
ALOGE("failed to find block %d", head_block);
return -1;
}
add_block_to_ranges(ranges, block);
if (encrypted) {
if (write_at_offset(buffers[head].data(), sb.st_blksize, wfd.get(),
static_cast<off64_t>(sb.st_blksize) * block) != 0) {
if (write_at_offset(buffers[head].data(), sb.st_blksize, wfd,
static_cast<off64_t>(sb.st_blksize) * block) != 0) {
return -1;
}
}
@@ -260,7 +261,7 @@ static int produce_block_map(const char* path, const char* map_file, const char*
if (encrypted) {
size_t to_read = static_cast<size_t>(
std::min(static_cast<off64_t>(sb.st_blksize), sb.st_size - pos));
if (!android::base::ReadFully(fd.get(), buffers[tail].data(), to_read)) {
if (!android::base::ReadFully(fd, buffers[tail].data(), to_read)) {
ALOGE("failed to read: %s", strerror(errno));
return -1;
}
@@ -277,14 +278,14 @@ static int produce_block_map(const char* path, const char* map_file, const char*
while (head != tail) {
// write out head buffer
int block = head_block;
if (ioctl(fd.get(), FIBMAP, &block) != 0) {
if (ioctl(fd, FIBMAP, &block) != 0) {
ALOGE("failed to find block %d", head_block);
return -1;
}
add_block_to_ranges(ranges, block);
if (encrypted) {
if (write_at_offset(buffers[head].data(), sb.st_blksize, wfd.get(),
static_cast<off64_t>(sb.st_blksize) * block) != 0) {
if (write_at_offset(buffers[head].data(), sb.st_blksize, wfd,
static_cast<off64_t>(sb.st_blksize) * block) != 0) {
return -1;
}
}
@@ -293,38 +294,36 @@ static int produce_block_map(const char* path, const char* map_file, const char*
}
if (!android::base::WriteStringToFd(
android::base::StringPrintf("%zu\n", ranges.size() / 2), mapfd.get())) {
android::base::StringPrintf("%zu\n", ranges.size() / 2), mapfd)) {
ALOGE("failed to write %s: %s", tmp_map_file.c_str(), strerror(errno));
return -1;
}
for (size_t i = 0; i < ranges.size(); i += 2) {
if (!android::base::WriteStringToFd(
android::base::StringPrintf("%d %d\n", ranges[i], ranges[i+1]), mapfd.get())) {
android::base::StringPrintf("%d %d\n", ranges[i], ranges[i+1]), mapfd)) {
ALOGE("failed to write %s: %s", tmp_map_file.c_str(), strerror(errno));
return -1;
}
}
if (fsync(mapfd.get()) == -1) {
if (fsync(mapfd) == -1) {
ALOGE("failed to fsync \"%s\": %s", tmp_map_file.c_str(), strerror(errno));
return -1;
}
if (close(mapfd.get() == -1)) {
if (close(mapfd.release()) == -1) {
ALOGE("failed to close %s: %s", tmp_map_file.c_str(), strerror(errno));
return -1;
}
mapfd = -1;
if (encrypted) {
if (fsync(wfd.get()) == -1) {
if (fsync(wfd) == -1) {
ALOGE("failed to fsync \"%s\": %s", blk_dev, strerror(errno));
return -1;
}
if (close(wfd.get()) == -1) {
if (close(wfd.release()) == -1) {
ALOGE("failed to close %s: %s", blk_dev, strerror(errno));
return -1;
}
wfd = -1;
}
if (rename(tmp_map_file.c_str(), map_file) == -1) {
@@ -334,20 +333,19 @@ static int produce_block_map(const char* path, const char* map_file, const char*
// Sync dir to make rename() result written to disk.
std::string file_name = map_file;
std::string dir_name = dirname(&file_name[0]);
unique_fd dfd(open(dir_name.c_str(), O_RDONLY | O_DIRECTORY));
if (!dfd) {
android::base::unique_fd dfd(open(dir_name.c_str(), O_RDONLY | O_DIRECTORY));
if (dfd == -1) {
ALOGE("failed to open dir %s: %s", dir_name.c_str(), strerror(errno));
return -1;
}
if (fsync(dfd.get()) == -1) {
if (fsync(dfd) == -1) {
ALOGE("failed to fsync %s: %s", dir_name.c_str(), strerror(errno));
return -1;
}
if (close(dfd.get() == -1)) {
if (close(dfd.release()) == -1) {
ALOGE("failed to close %s: %s", dir_name.c_str(), strerror(errno));
return -1;
}
dfd = -1;
return 0;
}
@@ -371,12 +369,12 @@ static int read_bootloader_message(bootloader_message* out) {
ALOGE("failed to find /misc partition.");
return -1;
}
unique_fd fd(open(misc_blk_device.c_str(), O_RDONLY));
if (!fd) {
android::base::unique_fd fd(open(misc_blk_device.c_str(), O_RDONLY));
if (fd == -1) {
ALOGE("failed to open %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
if (!android::base::ReadFully(fd.get(), out, sizeof(*out))) {
if (!android::base::ReadFully(fd, out, sizeof(*out))) {
ALOGE("failed to read %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
@@ -389,17 +387,17 @@ static int write_bootloader_message(const bootloader_message* in) {
ALOGE("failed to find /misc partition.");
return -1;
}
unique_fd fd(open(misc_blk_device.c_str(), O_WRONLY | O_SYNC));
if (!fd) {
android::base::unique_fd fd(open(misc_blk_device.c_str(), O_WRONLY | O_SYNC));
if (fd == -1) {
ALOGE("failed to open %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
if (!android::base::WriteFully(fd.get(), in, sizeof(*in))) {
if (!android::base::WriteFully(fd, in, sizeof(*in))) {
ALOGE("failed to write %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
// TODO: O_SYNC and fsync() duplicates each other?
if (fsync(fd.get()) == -1) {
if (fsync(fd) == -1) {
ALOGE("failed to fsync %s: %s", misc_blk_device.c_str(), strerror(errno));
return -1;
}
@@ -465,8 +463,9 @@ static int uncrypt(const char* input_path, const char* map_file, int status_fd)
static int uncrypt_wrapper(const char* input_path, const char* map_file,
const std::string& status_file) {
// The pipe has been created by the system server.
unique_fd status_fd(open(status_file.c_str(), O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (!status_fd) {
android::base::unique_fd status_fd(open(status_file.c_str(),
O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (status_fd == -1) {
ALOGE("failed to open pipe \"%s\": %s", status_file.c_str(), strerror(errno));
return 1;
}
@@ -474,46 +473,48 @@ static int uncrypt_wrapper(const char* input_path, const char* map_file,
std::string package;
if (input_path == nullptr) {
if (!find_uncrypt_package(UNCRYPT_PATH_FILE, &package)) {
android::base::WriteStringToFd("-1\n", status_fd.get());
android::base::WriteStringToFd("-1\n", status_fd);
return 1;
}
input_path = package.c_str();
}
CHECK(map_file != nullptr);
int status = uncrypt(input_path, map_file, status_fd.get());
int status = uncrypt(input_path, map_file, status_fd);
if (status != 0) {
android::base::WriteStringToFd("-1\n", status_fd.get());
android::base::WriteStringToFd("-1\n", status_fd);
return 1;
}
android::base::WriteStringToFd("100\n", status_fd.get());
android::base::WriteStringToFd("100\n", status_fd);
return 0;
}
static int clear_bcb(const std::string& status_file) {
unique_fd status_fd(open(status_file.c_str(), O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (!status_fd) {
android::base::unique_fd status_fd(open(status_file.c_str(),
O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (status_fd == -1) {
ALOGE("failed to open pipe \"%s\": %s", status_file.c_str(), strerror(errno));
return 1;
}
bootloader_message boot = {};
if (write_bootloader_message(&boot) != 0) {
android::base::WriteStringToFd("-1\n", status_fd.get());
android::base::WriteStringToFd("-1\n", status_fd);
return 1;
}
android::base::WriteStringToFd("100\n", status_fd.get());
android::base::WriteStringToFd("100\n", status_fd);
return 0;
}
static int setup_bcb(const std::string& command_file, const std::string& status_file) {
unique_fd status_fd(open(status_file.c_str(), O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (!status_fd) {
android::base::unique_fd status_fd(open(status_file.c_str(),
O_WRONLY | O_CREAT | O_SYNC, S_IRUSR | S_IWUSR));
if (status_fd == -1) {
ALOGE("failed to open pipe \"%s\": %s", status_file.c_str(), strerror(errno));
return 1;
}
std::string content;
if (!android::base::ReadFileToString(command_file, &content)) {
ALOGE("failed to read \"%s\": %s", command_file.c_str(), strerror(errno));
android::base::WriteStringToFd("-1\n", status_fd.get());
android::base::WriteStringToFd("-1\n", status_fd);
return 1;
}
bootloader_message boot = {};
@@ -522,10 +523,10 @@ static int setup_bcb(const std::string& command_file, const std::string& status_
strlcat(boot.recovery, content.c_str(), sizeof(boot.recovery));
if (write_bootloader_message(&boot) != 0) {
ALOGE("failed to set bootloader message");
android::base::WriteStringToFd("-1\n", status_fd.get());
android::base::WriteStringToFd("-1\n", status_fd);
return 1;
}
android::base::WriteStringToFd("100\n", status_fd.get());
android::base::WriteStringToFd("100\n", status_fd);
return 0;
}