PawletOS/external_libcamera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libcamera: ipa: Remove character restriction on the IPA name

Browse Source 
Remove the restriction on using the '/' character in the IPA name
string. This allows more flexibility in IPA directory structures where
different IPA modules might live in subdirectories under the usual
src/ipa/<platform>/ top level directory.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo.mondi@ideasonboard.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
This commit is contained in:
Naushir Patuck
2023-05-03 13:20:24 +01:00
committed by Laurent Pinchart
parent 312e9910ba
commit 6388449a79
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcamera/ipa_module.cpp
+12 -7
View File
@@ -225,9 +225,9 @@ Span<const uint8_t> elfLoadSymbol(Span<const uint8_t> elf, const char *symbol)
* \brief The name of the IPA module
*
* The name may be used to build file system paths to IPA-specific resources.
* It shall only contain printable characters, and may not contain '/', '*',
* '?' or '\'. For IPA modules included in libcamera, it shall match the
* directory of the IPA module in the source tree.
* It shall only contain printable characters, and may not contain '*', '?' or
* '\'. For IPA modules included in libcamera, it shall match the directory of
* the IPA module in the source tree.
*
* \todo Allow user to choose to isolate open source IPAs
*/
@@ -300,13 +300,18 @@ int IPAModule::loadIPAModuleInfo()
return -EINVAL;
}
/* Validate the IPA module name. */
/*
* Validate the IPA module name.
*
* \todo Consider module naming restrictions to avoid escaping from a
* base directory. Forbidding ".." may be enough, but this may be best
* implemented in a different layer.
*/
std::string ipaName = info_.name;
auto iter = std::find_if_not(ipaName.begin(), ipaName.end(),
[](unsigned char c) -> bool {
return isprint(c) && c != '/' &&
c != '?' && c != '*' &&
c != '\\';
return isprint(c) && c != '?' &&
c != '*' && c != '\\';
});
if (iter != ipaName.end()) {
LOG(IPAModule, Error)