ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "snapuserd: Address alignment fault on 32-bit systems"

Browse source
This commit is contained in:
Akilesh Kailash 2021-12-01 20:36:24 +00:00 • committed by Gerrit Code Review
commit cddf0f75cf
2 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs_mgr/libsnapshot/snapuserd/dm-snapshot-merge/snapuserd_readahead.cpp
View file

@ -246,9 +246,15 @@ bool ReadAheadThread::ReconstructDataFromCow() {
int num_ops = 0;
int total_blocks_merged = 0;
// This memcpy is important as metadata_buffer_ will be an unaligned address and will fault
// on 32-bit systems
std::unique_ptr<uint8_t[]> metadata_buffer =
std::make_unique<uint8_t[]>(snapuserd_->GetBufferMetadataSize());
memcpy(metadata_buffer.get(), metadata_buffer_, snapuserd_->GetBufferMetadataSize());
while (true) {
struct ScratchMetadata* bm = reinterpret_cast<struct ScratchMetadata*>(
(char*)metadata_buffer_ + metadata_offset);
(char*)metadata_buffer.get() + metadata_offset);
// Done reading metadata
if (bm->new_block == 0 && bm->file_offset == 0) {

8
fs_mgr/libsnapshot/snapuserd/user-space-merge/snapuserd_readahead.cpp
View file

@ -121,9 +121,15 @@ bool ReadAhead::ReconstructDataFromCow() {
int num_ops = 0;
int total_blocks_merged = 0;
// This memcpy is important as metadata_buffer_ will be an unaligned address and will fault
// on 32-bit systems
std::unique_ptr<uint8_t[]> metadata_buffer =
std::make_unique<uint8_t[]>(snapuserd_->GetBufferMetadataSize());
memcpy(metadata_buffer.get(), metadata_buffer_, snapuserd_->GetBufferMetadataSize());
while (true) {
struct ScratchMetadata* bm = reinterpret_cast<struct ScratchMetadata*>(
(char*)metadata_buffer_ + metadata_offset);
(char*)metadata_buffer.get() + metadata_offset);
// Done reading metadata
if (bm->new_block == 0 && bm->file_offset == 0) {