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

Merge "trusty: apploader: fail specifically if app package is 0 bytes" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-12-07 18:53:08 +00:00 committed by Gerrit Code Review
commit e5bb7ef272
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
trusty/apploader/apploader.cpp
View file

@ -107,7 +107,11 @@ static unique_fd read_file(const char* file_name, off64_t* out_file_size) {
return {};
}
assert(st.st_size >= 0);
if (st.st_size == 0) {
LOG(ERROR) << "Zero length file '" << file_name << "'";
return {};
}
file_size = st.st_size;
/* The dmabuf size needs to be a multiple of the page size */
@ -123,7 +127,8 @@ static unique_fd read_file(const char* file_name, off64_t* out_file_size) {
BufferAllocator alloc;
unique_fd dmabuf_fd(alloc.Alloc(kDmabufSystemHeapName, file_page_size));
if (!dmabuf_fd.ok()) {
LOG(ERROR) << "Error creating dmabuf: " << dmabuf_fd.get();
LOG(ERROR) << "Error creating dmabuf for " << file_page_size
<< " bytes: " << dmabuf_fd.get();
return dmabuf_fd;
}