mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH v2] image-fit: use real size of fit image
@ 2022-07-29 20:54 Daniel Brát
  0 siblings, 0 replies; only message in thread
From: Daniel Brát @ 2022-07-29 20:54 UTC (permalink / raw)
  To: barebox; +Cc: Daniel Brát

The real size of the fit image might be significantly smaller than it may
appear to be based on the specified filename. For example, if path to raw disk
partition is passed (eg. /dev/disk0.1), the size of the partition itself
might be several times larger than the fit image it contains at the moment
(so it has headroom for possible future image size changes).
This modification uses the fdt header field 'totalsize' to read-in only what
is needed.

Signed-off-by: Daniel Brát <danek.brat@gmail.com>
---
v2: use fdt32_to_cpu to read the totalsize from header
---
 common/image-fit.c | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/common/image-fit.c b/common/image-fit.c
index a410632d7..de65e3dd1 100644
--- a/common/image-fit.c
+++ b/common/image-fit.c
@@ -774,13 +774,18 @@ struct fit_handle *fit_open_buf(const void *buf, size_t size, bool verbose,
 				enum bootm_verify verify)
 {
 	struct fit_handle *handle;
+	struct fdt_header *header;
 	int ret;
 
+	if (size < sizeof(*header))
+		return ERR_PTR(-EINVAL);
+
+	header = (struct fdt_header*)buf;
 	handle = xzalloc(sizeof(struct fit_handle));
 
 	handle->verbose = verbose;
 	handle->fit = buf;
-	handle->size = size;
+	handle->size = fdt32_to_cpu(header->totalsize);
 	handle->verify = verify;
 
 	ret = fit_do_open(handle);
@@ -807,15 +812,31 @@ struct fit_handle *fit_open(const char *filename, bool verbose,
 			    enum bootm_verify verify)
 {
 	struct fit_handle *handle;
-	int ret;
+	struct fdt_header header;
+	int fd, ret;
 
 	handle = xzalloc(sizeof(struct fit_handle));
 
 	handle->verbose = verbose;
 	handle->verify = verify;
 
+	fd = open(filename, O_RDONLY);
+	if (fd < 0) {
+		pr_err("unable to open %s: %s\n", filename, strerror(errno));
+		return ERR_PTR(-errno);
+	}
+
+	ret = read_full(fd, &header, sizeof(header));
+	if (ret < 0) {
+		close(fd);
+		pr_err("unable to read %s: %s\n", filename, strerror(errno));
+		return ERR_PTR(-errno);
+	}
+
+	close(fd);
+
 	ret = read_file_2(filename, &handle->size, &handle->fit_alloc,
-			  FILESIZE_MAX);
+			  fdt32_to_cpu(header.totalsize));
 	if (ret) {
 		pr_err("unable to read %s: %s\n", filename, strerror(-ret));
 		return ERR_PTR(ret);
-- 
2.17.1




^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2022-07-29 20:56 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-07-29 20:54 [PATCH v2] image-fit: use real size of fit image Daniel Brát

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox