summaryrefslogtreecommitdiffstats
path: root/uncrypt
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@google.com>2017-12-08 22:19:23 +0100
committerJaegeuk Kim <jaegeuk@google.com>2018-04-05 04:28:15 +0200
commit848f227eea524a48208bdd4181f90fb63a31ed2b (patch)
treeeb377eca2baa25005af12df0839a9d2a1d5a049e /uncrypt
parentmkfs.f2fs: specify sector size for target image size (diff)
downloadandroid_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar.gz
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar.bz2
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar.lz
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar.xz
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.tar.zst
android_bootable_recovery-848f227eea524a48208bdd4181f90fb63a31ed2b.zip
Diffstat (limited to 'uncrypt')
-rw-r--r--uncrypt/uncrypt.cpp26
1 files changed, 22 insertions, 4 deletions
diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp
index 645faadbf..bb43c2c4a 100644
--- a/uncrypt/uncrypt.cpp
+++ b/uncrypt/uncrypt.cpp
@@ -172,10 +172,14 @@ static struct fstab* read_fstab() {
return fstab;
}
-static const char* find_block_device(const char* path, bool* encryptable, bool* encrypted) {
+static const char* find_block_device(const char* path, bool* encryptable, bool* encrypted, bool *f2fs_fs) {
// Look for a volume whose mount point is the prefix of path and
// return its block device. Set encrypted if it's currently
// encrypted.
+
+ // ensure f2fs_fs is set to 0 first.
+ if (f2fs_fs)
+ *f2fs_fs = false;
for (int i = 0; i < fstab->num_entries; ++i) {
struct fstab_rec* v = &fstab->recs[i];
if (!v->mount_point) {
@@ -192,6 +196,8 @@ static const char* find_block_device(const char* path, bool* encryptable, bool*
*encrypted = true;
}
}
+ if (f2fs_fs && strcmp(v->fs_type, "f2fs") == 0)
+ *f2fs_fs = true;
return v->blk_device;
}
}
@@ -244,7 +250,7 @@ static int retry_fibmap(const int fd, const char* name, int* block, const int he
}
static int produce_block_map(const char* path, const char* map_file, const char* blk_dev,
- bool encrypted, int socket) {
+ bool encrypted, bool f2fs_fs, int socket) {
std::string err;
if (!android::base::RemoveFileIfExists(map_file, &err)) {
LOG(ERROR) << "failed to remove the existing map file " << map_file << ": " << err;
@@ -307,6 +313,17 @@ static int produce_block_map(const char* path, const char* map_file, const char*
}
}
+#ifndef F2FS_IOC_SET_DONTMOVE
+#ifndef F2FS_IOCTL_MAGIC
+#define F2FS_IOCTL_MAGIC 0xf5
+#endif
+#define F2FS_IOC_SET_DONTMOVE _IO(F2FS_IOCTL_MAGIC, 13)
+#endif
+ if (f2fs_fs && ioctl(fd, F2FS_IOC_SET_DONTMOVE) < 0) {
+ PLOG(ERROR) << "Failed to set non-movable file for f2fs: " << path << " on " << blk_dev;
+ return kUncryptIoctlError;
+ }
+
off64_t pos = 0;
int last_progress = 0;
while (pos < sb.st_size) {
@@ -458,7 +475,8 @@ static int uncrypt(const char* input_path, const char* map_file, const int socke
bool encryptable;
bool encrypted;
- const char* blk_dev = find_block_device(path, &encryptable, &encrypted);
+ bool f2fs_fs;
+ const char* blk_dev = find_block_device(path, &encryptable, &encrypted, &f2fs_fs);
if (blk_dev == nullptr) {
LOG(ERROR) << "failed to find block device for " << path;
return kUncryptBlockDeviceFindError;
@@ -479,7 +497,7 @@ static int uncrypt(const char* input_path, const char* map_file, const int socke
// and /sdcard we leave the file alone.
if (strncmp(path, "/data/", 6) == 0) {
LOG(INFO) << "writing block map " << map_file;
- return produce_block_map(path, map_file, blk_dev, encrypted, socket);
+ return produce_block_map(path, map_file, blk_dev, encrypted, f2fs_fs, socket);
}
return 0;