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

snapshot_test: Fix overflow in statvfs arithmetics

Browse source 
Operations on (unsigned long) f_bsize and f_bfree are correctly handled
on 64 bit architectures, but when switching to 32 bit, the
multiplication between the two could result in an overflow, causing the
test to crash.
Fix by using a uint64_t operand, hinting the compiler to handle the
whole multiplication with 64 bit operands.

Bug: 154355449
Bug: 148889015
Test: vts_libsnapshot_test (32 bit)
Signed-off-by: Alessio Balsini <balsini@google.com>
Change-Id: Ief5c03ff7954c4a3e8597ef6e7df467f59428877
This commit is contained in:
Alessio Balsini 2020-04-30 20:48:48 +01:00
parent 1a342a12f3
commit 75672f8be5
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs_mgr/libsnapshot/test_helpers.cpp
View file

@ -212,8 +212,8 @@ AssertionResult LowSpaceUserdata::ReadUserdataStats() {
return AssertionFailure() << strerror(errno);
}
bsize_ = buf.f_bsize;
free_space_ = buf.f_bsize * buf.f_bfree;
available_space_ = buf.f_bsize * buf.f_bavail;
free_space_ = bsize_ * buf.f_bfree;
available_space_ = bsize_ * buf.f_bavail;
return AssertionSuccess();
}