diff options
author | Ethan Yonker <dees_troy@teamw.in> | 2018-08-30 22:16:27 +0200 |
---|---|---|
committer | Ethan Yonker <dees_troy@teamw.in> | 2018-08-31 17:37:08 +0200 |
commit | e9afc3de0fe1df795cc2f8cfab489177252812be (patch) | |
tree | 867698dc2670b97f821726b71043a232ad54c6ce /crypto/ext4crypt/Utils.cpp | |
parent | Merge AOSP android-9.0.0_r3 (diff) | |
download | android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar.gz android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar.bz2 android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar.lz android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar.xz android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.tar.zst android_bootable_recovery-e9afc3de0fe1df795cc2f8cfab489177252812be.zip |
Diffstat (limited to '')
-rw-r--r-- | crypto/ext4crypt/Utils.cpp | 34 |
1 files changed, 22 insertions, 12 deletions
diff --git a/crypto/ext4crypt/Utils.cpp b/crypto/ext4crypt/Utils.cpp index f0bf029b9..9711cef27 100644 --- a/crypto/ext4crypt/Utils.cpp +++ b/crypto/ext4crypt/Utils.cpp @@ -56,13 +56,13 @@ status_t ForkExecvp(const std::vector<std::string>& args, security_context_t con } if (setexeccon(context)) { - LOG(ERROR) << "Failed to setexeccon"; + LOG(ERROR) << "Failed to setexeccon" << std::endl; abort(); } abort(); status_t res = 1;//android_fork_execvp(argc, argv, NULL, false, true); if (setexeccon(nullptr)) { - LOG(ERROR) << "Failed to setexeccon"; + LOG(ERROR) << "Failed to setexeccon" << std::endl; abort(); } @@ -89,17 +89,17 @@ status_t ForkExecvp(const std::vector<std::string>& args, output.clear(); if (setexeccon(context)) { - LOG(ERROR) << "Failed to setexeccon"; + LOG(ERROR) << "Failed to setexeccon" << std::endl; abort(); } FILE* fp = popen(cmd.c_str(), "r"); if (setexeccon(nullptr)) { - LOG(ERROR) << "Failed to setexeccon"; + LOG(ERROR) << "Failed to setexeccon" << std::endl; abort(); } if (!fp) { - PLOG(ERROR) << "Failed to popen " << cmd; + PLOG(ERROR) << "Failed to popen " << cmd << std::endl; return -errno; } char line[1024]; @@ -108,7 +108,7 @@ status_t ForkExecvp(const std::vector<std::string>& args, output.push_back(std::string(line)); } if (pclose(fp) != 0) { - PLOG(ERROR) << "Failed to pclose " << cmd; + PLOG(ERROR) << "Failed to pclose " << cmd << std::endl; return -errno; } @@ -134,14 +134,14 @@ pid_t ForkExecvpAsync(const std::vector<std::string>& args) { close(STDERR_FILENO); if (execvp(argv[0], argv)) { - PLOG(ERROR) << "Failed to exec"; + PLOG(ERROR) << "Failed to exec" << std::endl; } _exit(1); } if (pid == -1) { - PLOG(ERROR) << "Failed to exec"; + PLOG(ERROR) << "Failed to exec" << std::endl; } free(argv); @@ -149,18 +149,20 @@ pid_t ForkExecvpAsync(const std::vector<std::string>& args) { } status_t ReadRandomBytes(size_t bytes, std::string& out) { - out.clear(); + out.resize(bytes); + return ReadRandomBytes(bytes, &out[0]); +} +status_t ReadRandomBytes(size_t bytes, char* buf) { int fd = TEMP_FAILURE_RETRY(open("/dev/urandom", O_RDONLY | O_CLOEXEC | O_NOFOLLOW)); if (fd == -1) { return -errno; } - char buf[BUFSIZ]; size_t n; - while ((n = TEMP_FAILURE_RETRY(read(fd, &buf[0], std::min(sizeof(buf), bytes)))) > 0) { - out.append(buf, n); + while ((n = TEMP_FAILURE_RETRY(read(fd, &buf[0], bytes))) > 0) { bytes -= n; + buf += n; } close(fd); @@ -247,6 +249,14 @@ std::string BuildDataMiscDePath(userid_t userId) { return StringPrintf("%s/misc_de/%u", BuildDataPath(nullptr).c_str(), userId); } +std::string BuildDataVendorCePath(userid_t userId) { + return StringPrintf("%s/vendor_ce/%u", BuildDataPath(nullptr).c_str(), userId); +} + +std::string BuildDataVendorDePath(userid_t userId) { + return StringPrintf("%s/vendor_de/%u", BuildDataPath(nullptr).c_str(), userId); +} + // Keep in sync with installd (frameworks/native/cmds/installd/utils.h) std::string BuildDataProfilesDePath(userid_t userId) { return StringPrintf("%s/misc/profiles/cur/%u", BuildDataPath(nullptr).c_str(), userId); |