summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-29 05:45:40 +0300
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-04-14 02:03:21 +0300
commit836bd5a7a24623ccebb2cfb461190617410fd553 (patch)
tree42d8813514fb88dc3f38774e3e26291c16b97fe0
parentb9b54fd1b4b10e783ef6a2397913071aeb07d0c3 (diff)
libcamera: ipa_module: Simplify error handling in loadIPAModuleInfo()
Use the File helper class to handle cleanup of the mapped file to simplify error handling in loadIPAModuleInfo(). Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
-rw-r--r--src/libcamera/ipa_module.cpp58
1 files changed, 21 insertions, 37 deletions
diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp
index a01d0757..d1c411e1 100644
--- a/src/libcamera/ipa_module.cpp
+++ b/src/libcamera/ipa_module.cpp
@@ -21,6 +21,7 @@
#include <tuple>
#include <unistd.h>
+#include "file.h"
#include "log.h"
#include "pipeline_handler.h"
#include "utils.h"
@@ -283,55 +284,38 @@ IPAModule::~IPAModule()
int IPAModule::loadIPAModuleInfo()
{
- int fd = open(libPath_.c_str(), O_RDONLY);
- if (fd < 0) {
- int ret = -errno;
+ File file{ libPath_ };
+ if (!file.open(File::ReadOnly)) {
LOG(IPAModule, Error) << "Failed to open IPA library: "
- << strerror(-ret);
- return ret;
+ << strerror(-file.error());
+ return file.error();
}
- void *data = nullptr;
- size_t dataSize;
- void *map;
- size_t soSize;
- struct stat st;
- int ret = fstat(fd, &st);
- if (ret < 0)
- goto close;
- soSize = st.st_size;
- map = mmap(NULL, soSize, PROT_READ, MAP_PRIVATE, fd, 0);
- if (map == MAP_FAILED) {
- ret = -errno;
- goto close;
+ Span<uint8_t> data = file.map(0, -1, File::MapPrivate);
+ int ret = elfVerifyIdent(data.data(), data.size());
+ if (ret) {
+ LOG(IPAModule, Error) << "IPA module is not an ELF file";
+ return ret;
}
- ret = elfVerifyIdent(map, soSize);
- if (ret)
- goto unmap;
+ void *info = nullptr;
+ size_t infoSize;
- std::tie(data, dataSize) = elfLoadSymbol(map, soSize, "ipaModuleInfo");
-
- if (data && dataSize == sizeof(info_))
- memcpy(&info_, data, dataSize);
+ std::tie(info, infoSize) = elfLoadSymbol(data.data(), data.size(),
+ "ipaModuleInfo");
+ if (!info || infoSize != sizeof(info_)) {
+ LOG(IPAModule, Error) << "IPA module has no valid info";
+ return -EINVAL;
+ }
- if (!data)
- goto unmap;
+ memcpy(&info_, info, infoSize);
if (info_.moduleAPIVersion != IPA_MODULE_API_VERSION) {
LOG(IPAModule, Error) << "IPA module API version mismatch";
- ret = -EINVAL;
+ return -EINVAL;
}
-unmap:
- munmap(map, soSize);
-close:
- if (ret || !data)
- LOG(IPAModule, Error)
- << "Error loading IPA module info for " << libPath_;
-
- close(fd);
- return ret;
+ return 0;
}
/**