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

Merge "Move ReadCowHeader to CowReader" into main am: f5f0a10541 am: 2457e0b7e8 am: 9d67604c0d

Browse source 
Original change: https://android-review.googlesource.com/c/platform/system/core/+/2781728

Change-Id: I737f6696221edf913cf84d89544c783908732741
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Daniel Zheng 2023-10-10 23:30:57 +00:00 committed by Automerger Merge Worker
commit 4156b81180
4 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs_mgr/libsnapshot/include/libsnapshot/cow_reader.h
View file

@ -188,5 +188,7 @@ class CowReader final : public ICowReader {
uint8_t compression_type_ = kCowCompressNone;
};
bool ReadCowHeader(android::base::borrowed_fd fd, CowHeader* header);
} // namespace snapshot
} // namespace android

29
fs_mgr/libsnapshot/libsnapshot_cow/cow_reader.cpp
View file

@ -34,6 +34,35 @@
namespace android {
namespace snapshot {
bool ReadCowHeader(android::base::borrowed_fd fd, CowHeader* header) {
if (lseek(fd.get(), 0, SEEK_SET) < 0) {
PLOG(ERROR) << "lseek header failed";
return false;
}
memset(header, 0, sizeof(*header));
if (!android::base::ReadFully(fd, &header->prefix, sizeof(header->prefix))) {
return false;
}
if (header->prefix.magic != kCowMagicNumber) {
LOG(ERROR) << "Header Magic corrupted. Magic: " << header->prefix.magic
<< "Expected: " << kCowMagicNumber;
return false;
}
if (header->prefix.header_size > sizeof(CowHeader)) {
LOG(ERROR) << "Unknown CowHeader size (got " << header->prefix.header_size
<< " bytes, expected at most " << sizeof(CowHeader) << " bytes)";
return false;
}
if (lseek(fd.get(), 0, SEEK_SET) < 0) {
PLOG(ERROR) << "lseek header failed";
return false;
}
return android::base::ReadFully(fd, header, header->prefix.header_size);
}
CowReader::CowReader(ReaderFlags reader_flag, bool is_merge)
: fd_(-1),
header_(),

29
fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.cpp
View file

@ -23,35 +23,6 @@ namespace snapshot {
using android::base::borrowed_fd;
bool ReadCowHeader(android::base::borrowed_fd fd, CowHeader* header) {
if (lseek(fd.get(), 0, SEEK_SET) < 0) {
PLOG(ERROR) << "lseek header failed";
return false;
}
memset(header, 0, sizeof(*header));
if (!android::base::ReadFully(fd, &header->prefix, sizeof(header->prefix))) {
return false;
}
if (header->prefix.magic != kCowMagicNumber) {
LOG(ERROR) << "Header Magic corrupted. Magic: " << header->prefix.magic
<< "Expected: " << kCowMagicNumber;
return false;
}
if (header->prefix.header_size > sizeof(CowHeader)) {
LOG(ERROR) << "Unknown CowHeader size (got " << header->prefix.header_size
<< " bytes, expected at most " << sizeof(CowHeader) << " bytes)";
return false;
}
if (lseek(fd.get(), 0, SEEK_SET) < 0) {
PLOG(ERROR) << "lseek header failed";
return false;
}
return android::base::ReadFully(fd, header, header->prefix.header_size);
}
bool CowParserV2::Parse(borrowed_fd fd, const CowHeader& header, std::optional<uint64_t> label) {
auto pos = lseek(fd.get(), 0, SEEK_END);
if (pos < 0) {

2
fs_mgr/libsnapshot/libsnapshot_cow/parser_v2.h
View file

@ -49,7 +49,5 @@ class CowParserV2 {
std::optional<uint64_t> last_label_;
};
bool ReadCowHeader(android::base::borrowed_fd fd, CowHeader* header);
} // namespace snapshot
} // namespace android