From: Marco Felsch <m.felsch@pengutronix.de>
To: Sascha Hauer <s.hauer@pengutronix.de>,
BAREBOX <barebox@lists.infradead.org>
Cc: Marco Felsch <m.felsch@pengutronix.de>
Subject: [PATCH v5 09/11] FIT: fit_open: make filename handling more robust
Date: Mon, 18 Aug 2025 19:26:17 +0200 [thread overview]
Message-ID: <20250818-v2024-05-0-topic-fit-overlay-v5-9-b92e466a1d32@pengutronix.de> (raw)
In-Reply-To: <20250818-v2024-05-0-topic-fit-overlay-v5-0-b92e466a1d32@pengutronix.de>
Require the filename to start at the root '/' directory and resolve any
possible link to make the filename handling more robust.
This is in preparation of adding cached fit_open support.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
common/image-fit.c | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/common/image-fit.c b/common/image-fit.c
index 0067f46e60bc954b418aef3398e2c10856b41c02..1cb407d4d86cb3d0a643149bb08c46caadcd56fe 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -972,12 +972,25 @@ struct fit_handle *fit_open_buf(const void *buf, size_t size, bool verbose,
*
* Return: A handle to a FIT image or a ERR_PTR
*/
-struct fit_handle *fit_open(const char *filename, bool verbose,
+struct fit_handle *fit_open(const char *_filename, bool verbose,
enum bootm_verify verify, loff_t max_size)
{
struct fit_handle *handle;
+ char *filename;
int ret;
+ if (*_filename != '/') {
+ pr_err("The FIT filename must start with '/'\n");
+ return ERR_PTR(-EINVAL);
+ }
+
+ /* dirfd is ignored, since _filename is absolute */
+ filename = canonicalize_path(AT_FDCWD, _filename);
+ if (!filename) {
+ pr_err("Failed to resolve %s with %s\n", _filename, strerror(errno));
+ return ERR_PTR(-errno);
+ }
+
handle = xzalloc(sizeof(struct fit_handle));
handle->verbose = verbose;
@@ -988,9 +1001,12 @@ struct fit_handle *fit_open(const char *filename, bool verbose,
if (ret && ret != -EFBIG) {
pr_err("unable to read %s: %pe\n", filename, ERR_PTR(ret));
free(handle);
+ free(filename);
return ERR_PTR(ret);
}
+ free(filename);
+
handle->fit = handle->fit_alloc;
ret = fit_do_open(handle);
--
2.39.5
next prev parent reply other threads:[~2025-08-18 18:17 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-18 17:26 [PATCH v5 00/11] Add FIT image overlay support Marco Felsch
2025-08-18 17:26 ` [PATCH v5 01/11] FIT: fix missing free in fit_open error path Marco Felsch
2025-08-18 17:26 ` [PATCH v5 02/11] FIT: fit_open_configuration: add match function support Marco Felsch
2025-08-18 17:26 ` [PATCH v5 03/11] of: overlay: make the pattern match function more generic Marco Felsch
2025-08-18 17:26 ` [PATCH v5 04/11] of: overlay: make search dir " Marco Felsch
2025-08-18 17:26 ` [PATCH v5 05/11] of: overlay: refactor of_overlay_global_fixup Marco Felsch
2025-08-18 17:26 ` [PATCH v5 06/11] FIT: make fit_config_verify_signature public Marco Felsch
2025-08-18 17:26 ` [PATCH v5 07/11] of: overlay: add FIT image overlay support Marco Felsch
2025-08-19 6:38 ` Sascha Hauer
2025-08-19 8:10 ` Marco Felsch
2025-08-20 8:16 ` Marco Felsch
2025-08-18 17:26 ` [PATCH v5 08/11] of: overlay: replace filename with an more unique name Marco Felsch
2025-08-18 17:26 ` Marco Felsch [this message]
2025-08-19 7:03 ` [PATCH v5 09/11] FIT: fit_open: make filename handling more robust Sascha Hauer
2025-08-19 8:19 ` Marco Felsch
2025-08-19 8:32 ` Sascha Hauer
2025-08-19 8:46 ` Marco Felsch
2025-08-18 17:26 ` [PATCH v5 10/11] FIT: fit_open: save the filename Marco Felsch
2025-08-18 17:26 ` [PATCH v5 11/11] FIT: add support to cache opened fit images Marco Felsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250818-v2024-05-0-topic-fit-overlay-v5-9-b92e466a1d32@pengutronix.de \
--to=m.felsch@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=s.hauer@pengutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox