{"id":3396,"url":"https://patchwork.libcamera.org/api/patches/3396/?format=json","web_url":"https://patchwork.libcamera.org/patch/3396/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200404015624.30440-7-laurent.pinchart@ideasonboard.com>","date":"2020-04-04T01:56:19","name":"[libcamera-devel,06/11] libcamera: ipa_module: Use Span class to tie data and size","commit_ref":null,"pull_url":null,"state":"superseded","archived":false,"hash":"6311e61afe228646bb0de057452ead6e5e69eafa","submitter":{"id":2,"url":"https://patchwork.libcamera.org/api/people/2/?format=json","name":"Laurent Pinchart","email":"laurent.pinchart@ideasonboard.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3396/mbox/","series":[{"id":797,"url":"https://patchwork.libcamera.org/api/series/797/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=797","date":"2020-04-04T01:56:13","name":"Sign IPA modules instead of checking their advertised license","version":1,"mbox":"https://patchwork.libcamera.org/series/797/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3396/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3396/checks/","tags":{},"headers":{"Return-Path":"","Received":["from perceval.ideasonboard.com (perceval.ideasonboard.com\n\t[IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 6A37F62DBB\n\tfor ;\n\tSat, 4 Apr 2020 03:56:40 +0200 (CEST)","from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi\n\t[81.175.216.236])\n\tby perceval.ideasonboard.com (Postfix) with ESMTPSA id ED882321\n\tfor ;\n\tSat, 4 Apr 2020 03:56:39 +0200 (CEST)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=ideasonboard.com\n\theader.i=@ideasonboard.com\n\theader.b=\"fpJ0syZP\"; dkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1585965400;\n\tbh=5jbzYwS9/2pyby3ZYr68DA5pCiRfYY5490PS0up3toY=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=fpJ0syZP2cFlkos8Q3gpj3ocPK2s5urVDpF2WQt1Pj9A0T9M29ENEZhGR+OcZdlh6\n\t87hnKFbLG11zPQiEQHKMZPuaXOuESYHTGApmhIkgEC+fbweiJzivh4klSLydd9Pv8a\n\tTWEZBKzdYHrgC/RgZy7TtiqEn+u6kE4rda99jJws=","From":"Laurent Pinchart ","To":"libcamera-devel@lists.libcamera.org","Date":"Sat, 4 Apr 2020 04:56:19 +0300","Message-Id":"<20200404015624.30440-7-laurent.pinchart@ideasonboard.com>","X-Mailer":"git-send-email 2.24.1","In-Reply-To":"<20200404015624.30440-1-laurent.pinchart@ideasonboard.com>","References":"<20200404015624.30440-1-laurent.pinchart@ideasonboard.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Subject":"[libcamera-devel] [PATCH 06/11] libcamera: ipa_module: Use Span\n\tclass to tie data and size","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Sat, 04 Apr 2020 01:56:42 -0000"},"content":"The IPAModule class passes pointers to data and the corresponding size\nas thwo different variables to several functions. Tie them together in a\nSpan.\n\nSigned-off-by: Laurent Pinchart \n---\n src/libcamera/ipa_module.cpp | 87 +++++++++++++++++-------------------\n 1 file changed, 40 insertions(+), 47 deletions(-)","diff":"diff --git a/src/libcamera/ipa_module.cpp b/src/libcamera/ipa_module.cpp\nindex d1c411e14ba9..5b6af15f2593 100644\n--- a/src/libcamera/ipa_module.cpp\n+++ b/src/libcamera/ipa_module.cpp\n@@ -18,9 +18,10 @@\n #include \n #include \n #include \n-#include \n #include \n \n+#include \n+\n #include \"file.h\"\n #include \"log.h\"\n #include \"pipeline_handler.h\"\n@@ -43,27 +44,26 @@ LOG_DEFINE_CATEGORY(IPAModule)\n namespace {\n \n template\n-typename std::remove_extent_t *elfPointer(void *map, off_t offset,\n-\t\t\t\t\t size_t fileSize, size_t objSize)\n+typename std::remove_extent_t *elfPointer(Span elf, off_t offset,\n+\t\t\t\t\t size_t objSize)\n {\n \tsize_t size = offset + objSize;\n-\tif (size > fileSize || size < objSize)\n+\tif (size > elf.size() || size < objSize)\n \t\treturn nullptr;\n \n \treturn reinterpret_cast *>\n-\t\t(static_cast(map) + offset);\n+\t\t(reinterpret_cast(elf.data()) + offset);\n }\n \n template\n-typename std::remove_extent_t *elfPointer(void *map, off_t offset,\n-\t\t\t\t\t size_t fileSize)\n+typename std::remove_extent_t *elfPointer(Span elf, off_t offset)\n {\n-\treturn elfPointer(map, offset, fileSize, sizeof(T));\n+\treturn elfPointer(elf, offset, sizeof(T));\n }\n \n-int elfVerifyIdent(void *map, size_t soSize)\n+int elfVerifyIdent(Span elf)\n {\n-\tchar *e_ident = elfPointer(map, 0, soSize);\n+\tchar *e_ident = elfPointer(elf, 0);\n \tif (!e_ident)\n \t\treturn -ENOEXEC;\n \n@@ -89,38 +89,36 @@ int elfVerifyIdent(void *map, size_t soSize)\n \n /**\n * \\brief Retrieve address and size of a symbol from an mmap'ed ELF file\n- * \\param[in] map Address of mmap'ed ELF file\n- * \\param[in] soSize Size of mmap'ed ELF file (in bytes)\n+ * \\param[in] elf Address and size of mmap'ed ELF file\n * \\param[in] symbol Symbol name\n *\n- * \\return zero or error code, address or nullptr, size of symbol or zero,\n- * respectively\n+ * \\return The memory region storing the symbol on success, or an empty span\n+ * otherwise\n */\n-std::tuple\n-elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n+Span elfLoadSymbol(Span elf, const char *symbol)\n {\n-\tElfW(Ehdr) *eHdr = elfPointer(map, 0, soSize);\n+\tElfW(Ehdr) *eHdr = elfPointer(elf, 0);\n \tif (!eHdr)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \n \toff_t offset = eHdr->e_shoff + eHdr->e_shentsize * eHdr->e_shstrndx;\n-\tElfW(Shdr) *sHdr = elfPointer(map, offset, soSize);\n+\tElfW(Shdr) *sHdr = elfPointer(elf, offset);\n \tif (!sHdr)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \toff_t shnameoff = sHdr->sh_offset;\n \n \t/* Locate .dynsym section header. */\n \tElfW(Shdr) *dynsym = nullptr;\n \tfor (unsigned int i = 0; i < eHdr->e_shnum; i++) {\n \t\toffset = eHdr->e_shoff + eHdr->e_shentsize * i;\n-\t\tsHdr = elfPointer(map, offset, soSize);\n+\t\tsHdr = elfPointer(elf, offset);\n \t\tif (!sHdr)\n-\t\t\treturn std::make_tuple(nullptr, 0);\n+\t\t\treturn {};\n \n \t\toffset = shnameoff + sHdr->sh_name;\n-\t\tchar *name = elfPointer(map, offset, soSize);\n+\t\tchar *name = elfPointer(elf, offset);\n \t\tif (!name)\n-\t\t\treturn std::make_tuple(nullptr, 0);\n+\t\t\treturn {};\n \n \t\tif (sHdr->sh_type == SHT_DYNSYM && !strcmp(name, \".dynsym\")) {\n \t\t\tdynsym = sHdr;\n@@ -130,13 +128,13 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n \n \tif (dynsym == nullptr) {\n \t\tLOG(IPAModule, Error) << \"ELF has no .dynsym section\";\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \t}\n \n \toffset = eHdr->e_shoff + eHdr->e_shentsize * dynsym->sh_link;\n-\tsHdr = elfPointer(map, offset, soSize);\n+\tsHdr = elfPointer(elf, offset);\n \tif (!sHdr)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \toff_t dynsym_nameoff = sHdr->sh_offset;\n \n \t/* Locate symbol in the .dynsym section. */\n@@ -144,15 +142,14 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n \tunsigned int dynsym_num = dynsym->sh_size / dynsym->sh_entsize;\n \tfor (unsigned int i = 0; i < dynsym_num; i++) {\n \t\toffset = dynsym->sh_offset + dynsym->sh_entsize * i;\n-\t\tElfW(Sym) *sym = elfPointer(map, offset, soSize);\n+\t\tElfW(Sym) *sym = elfPointer(elf, offset);\n \t\tif (!sym)\n-\t\t\treturn std::make_tuple(nullptr, 0);\n+\t\t\treturn {};\n \n \t\toffset = dynsym_nameoff + sym->st_name;\n-\t\tchar *name = elfPointer(map, offset, soSize,\n-\t\t\t\t\t strlen(symbol) + 1);\n+\t\tchar *name = elfPointer(elf, offset, strlen(symbol) + 1);\n \t\tif (!name)\n-\t\t\treturn std::make_tuple(nullptr, 0);\n+\t\t\treturn {};\n \n \t\tif (!strcmp(name, symbol) &&\n \t\t sym->st_info & STB_GLOBAL) {\n@@ -163,22 +160,22 @@ elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n \n \tif (targetSymbol == nullptr) {\n \t\tLOG(IPAModule, Error) << \"Symbol \" << symbol << \" not found\";\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \t}\n \n \t/* Locate and return data of symbol. */\n \tif (targetSymbol->st_shndx >= eHdr->e_shnum)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \toffset = eHdr->e_shoff + targetSymbol->st_shndx * eHdr->e_shentsize;\n-\tsHdr = elfPointer(map, offset, soSize);\n+\tsHdr = elfPointer(elf, offset);\n \tif (!sHdr)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \toffset = sHdr->sh_offset + (targetSymbol->st_value - sHdr->sh_addr);\n-\tchar *data = elfPointer(map, offset, soSize, targetSymbol->st_size);\n+\tuint8_t *data = elfPointer(elf, offset, targetSymbol->st_size);\n \tif (!data)\n-\t\treturn std::make_tuple(nullptr, 0);\n+\t\treturn {};\n \n-\treturn std::make_tuple(data, targetSymbol->st_size);\n+\treturn { data, targetSymbol->st_size };\n }\n \n } /* namespace */\n@@ -292,23 +289,19 @@ int IPAModule::loadIPAModuleInfo()\n \t}\n \n \tSpan data = file.map(0, -1, File::MapPrivate);\n-\tint ret = elfVerifyIdent(data.data(), data.size());\n+\tint ret = elfVerifyIdent(data);\n \tif (ret) {\n \t\tLOG(IPAModule, Error) << \"IPA module is not an ELF file\";\n \t\treturn ret;\n \t}\n \n-\tvoid *info = nullptr;\n-\tsize_t infoSize;\n-\n-\tstd::tie(info, infoSize) = elfLoadSymbol(data.data(), data.size(),\n-\t\t\t\t\t\t \"ipaModuleInfo\");\n-\tif (!info || infoSize != sizeof(info_)) {\n+\tSpan info = elfLoadSymbol(data, \"ipaModuleInfo\");\n+\tif (info.size() != sizeof(info_)) {\n \t\tLOG(IPAModule, Error) << \"IPA module has no valid info\";\n \t\treturn -EINVAL;\n \t}\n \n-\tmemcpy(&info_, info, infoSize);\n+\tmemcpy(&info_, info.data(), info.size());\n \n \tif (info_.moduleAPIVersion != IPA_MODULE_API_VERSION) {\n \t\tLOG(IPAModule, Error) << \"IPA module API version mismatch\";\n","prefixes":["libcamera-devel","06/11"]}