tequilaOS/platform_bootable_recovery
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Fix the permission of stashed blocks created by updater"

Browse source
This commit is contained in:
Tianjie Xu 2017-03-22 18:32:56 +00:00 committed by Gerrit Code Review
commit d882b8892a
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
updater/blockimg.cpp
View file

@ -44,6 +44,7 @@
#include <android-base/unique_fd.h> #include <android-base/unique_fd.h>
#include <applypatch/applypatch.h> #include <applypatch/applypatch.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#include <private/android_filesystem_config.h>
#include <ziparchive/zip_archive.h> #include <ziparchive/zip_archive.h>
#include "edify/expr.h" #include "edify/expr.h"
@ -772,6 +773,11 @@ static int WriteStash(const std::string& base, const std::string& id, int blocks
return -1; return -1;
} }
if (fchown(fd, AID_SYSTEM, AID_SYSTEM) != 0) { // system user
PLOG(ERROR) << "failed to chown \"" << fn << "\"";
return -1;
}
if (write_all(fd, buffer, blocks * BLOCKSIZE) == -1) { if (write_all(fd, buffer, blocks * BLOCKSIZE) == -1) {
return -1; return -1;
} }
@ -841,6 +847,12 @@ static int CreateStash(State* state, size_t maxblocks, const std::string& blockd
return -1; return -1;
} }
if (chown(dirname.c_str(), AID_SYSTEM, AID_SYSTEM) != 0) { // system user
ErrorAbort(state, kStashCreationFailure, "chown \"%s\" failed: %s\n", dirname.c_str(),
strerror(errno));
return -1;
}
if (CacheSizeCheck(max_stash_size) != 0) { if (CacheSizeCheck(max_stash_size) != 0) {
ErrorAbort(state, kStashCreationFailure, "not enough space for stash (%zu needed)\n", ErrorAbort(state, kStashCreationFailure, "not enough space for stash (%zu needed)\n",
max_stash_size); max_stash_size);