Patch Detail
Show a patch.
GET /api/1.1/patches/3440/?format=api
{ "id": 3440, "url": "https://patchwork.libcamera.org/api/1.1/patches/3440/?format=api", "web_url": "https://patchwork.libcamera.org/patch/3440/", "project": { "id": 1, "url": "https://patchwork.libcamera.org/api/1.1/projects/1/?format=api", "name": "libcamera", "link_name": "libcamera", "list_id": "libcamera_core", "list_email": "libcamera-devel@lists.libcamera.org", "web_url": "", "scm_url": "", "webscm_url": "" }, "msgid": "<20200413133047.11913-7-laurent.pinchart@ideasonboard.com>", "date": "2020-04-13T13:30:42", "name": "[libcamera-devel,v2,06/11] libcamera: ipa_module: Use Span class to tie data and size", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": false, "hash": "6311e61afe228646bb0de057452ead6e5e69eafa", "submitter": { "id": 2, "url": "https://patchwork.libcamera.org/api/1.1/people/2/?format=api", "name": "Laurent Pinchart", "email": "laurent.pinchart@ideasonboard.com" }, "delegate": null, "mbox": "https://patchwork.libcamera.org/patch/3440/mbox/", "series": [ { "id": 804, "url": "https://patchwork.libcamera.org/api/1.1/series/804/?format=api", "web_url": "https://patchwork.libcamera.org/project/libcamera/list/?series=804", "date": "2020-04-13T13:30:37", "name": "Sign IPA modules instead of checking their advertised license", "version": 2, "mbox": "https://patchwork.libcamera.org/series/804/mbox/" } ], "comments": "https://patchwork.libcamera.org/api/patches/3440/comments/", "check": "pending", "checks": "https://patchwork.libcamera.org/api/patches/3440/checks/", "tags": {}, "headers": { "Return-Path": "<laurent.pinchart@ideasonboard.com>", "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 D071062E08\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Apr 2020 15:31:06 +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 53118A42\n\tfor <libcamera-devel@lists.libcamera.org>;\n\tMon, 13 Apr 2020 15:31:06 +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=\"vgTTbszQ\"; dkim-atps=neutral", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com;\n\ts=mail; t=1586784666;\n\tbh=mDMFBxDOFHt8mjIXkU1WLDMXbiXth2FTPKh9rV5EfPc=;\n\th=From:To:Subject:Date:In-Reply-To:References:From;\n\tb=vgTTbszQpO4rXKmaH64x7tm4u+DNgW813xSw9sYn6y9U5K2nsEzsze7OOMHChZDSa\n\teg/Bge+ZryRlBINIrHKX1vERVgZ+MVSmAXc5pcBYA9QUYBewveLsiC5Nx9YdSw/84v\n\t3AoBkkzBoJ7s4vXgWgk6ysKSh4zejCS6YXWaXqmE=", "From": "Laurent Pinchart <laurent.pinchart@ideasonboard.com>", "To": "libcamera-devel@lists.libcamera.org", "Date": "Mon, 13 Apr 2020 16:30:42 +0300", "Message-Id": "<20200413133047.11913-7-laurent.pinchart@ideasonboard.com>", "X-Mailer": "git-send-email 2.24.1", "In-Reply-To": "<20200413133047.11913-1-laurent.pinchart@ideasonboard.com>", "References": "<20200413133047.11913-1-laurent.pinchart@ideasonboard.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "Subject": "[libcamera-devel] [PATCH v2 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": "<libcamera-devel.lists.libcamera.org>", "List-Unsubscribe": "<https://lists.libcamera.org/options/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=unsubscribe>", "List-Archive": "<https://lists.libcamera.org/pipermail/libcamera-devel/>", "List-Post": "<mailto:libcamera-devel@lists.libcamera.org>", "List-Help": "<mailto:libcamera-devel-request@lists.libcamera.org?subject=help>", "List-Subscribe": "<https://lists.libcamera.org/listinfo/libcamera-devel>,\n\t<mailto:libcamera-devel-request@lists.libcamera.org?subject=subscribe>", "X-List-Received-Date": "Mon, 13 Apr 2020 13:31:09 -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 <laurent.pinchart@ideasonboard.com>\nReviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>\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 <sys/mman.h>\n #include <sys/stat.h>\n #include <sys/types.h>\n-#include <tuple>\n #include <unistd.h>\n \n+#include <libcamera/span.h>\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<typename T>\n-typename std::remove_extent_t<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<T> *elfPointer(Span<uint8_t> 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<typename std::remove_extent_t<T> *>\n-\t\t(static_cast<char *>(map) + offset);\n+\t\t(reinterpret_cast<char *>(elf.data()) + offset);\n }\n \n template<typename T>\n-typename std::remove_extent_t<T> *elfPointer(void *map, off_t offset,\n-\t\t\t\t\t size_t fileSize)\n+typename std::remove_extent_t<T> *elfPointer(Span<uint8_t> elf, off_t offset)\n {\n-\treturn elfPointer<T>(map, offset, fileSize, sizeof(T));\n+\treturn elfPointer<T>(elf, offset, sizeof(T));\n }\n \n-int elfVerifyIdent(void *map, size_t soSize)\n+int elfVerifyIdent(Span<uint8_t> elf)\n {\n-\tchar *e_ident = elfPointer<char[EI_NIDENT]>(map, 0, soSize);\n+\tchar *e_ident = elfPointer<char[EI_NIDENT]>(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<void *, size_t>\n-elfLoadSymbol(void *map, size_t soSize, const char *symbol)\n+Span<uint8_t> elfLoadSymbol(Span<uint8_t> elf, const char *symbol)\n {\n-\tElfW(Ehdr) *eHdr = elfPointer<ElfW(Ehdr)>(map, 0, soSize);\n+\tElfW(Ehdr) *eHdr = elfPointer<ElfW(Ehdr)>(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<ElfW(Shdr)>(map, offset, soSize);\n+\tElfW(Shdr) *sHdr = elfPointer<ElfW(Shdr)>(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<ElfW(Shdr)>(map, offset, soSize);\n+\t\tsHdr = elfPointer<ElfW(Shdr)>(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<char[8]>(map, offset, soSize);\n+\t\tchar *name = elfPointer<char[8]>(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<ElfW(Shdr)>(map, offset, soSize);\n+\tsHdr = elfPointer<ElfW(Shdr)>(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<ElfW(Sym)>(map, offset, soSize);\n+\t\tElfW(Sym) *sym = elfPointer<ElfW(Sym)>(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<char>(map, offset, soSize,\n-\t\t\t\t\t strlen(symbol) + 1);\n+\t\tchar *name = elfPointer<char>(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<ElfW(Shdr)>(map, offset, soSize);\n+\tsHdr = elfPointer<ElfW(Shdr)>(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<char>(map, offset, soSize, targetSymbol->st_size);\n+\tuint8_t *data = elfPointer<uint8_t>(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<uint8_t> 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<uint8_t> 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", "v2", "06/11" ] }