From 4cfd609f8df1e9d1ef57a97855339a3f360bb079 Mon Sep 17 00:00:00 2001 From: Nishanth Menon Date: Tue, 4 Jan 2022 14:35:02 -0600 Subject: [PATCH] spl: fit: Skip attempting to load 0 length image commit 6d99f866952bb5df7fe699b3db29a97d75e5c445 upstream. When, for various reasons, a bad FIT image is used where a loadable image is marked as 0 length, attempt is made for a 0 length allocation and read of 0 byte read operation. Instead provide warning in log and skip attempting to do such a load. Signed-off-by: Nishanth Menon Reviewed-by: Aswath Govindraju [praneeth@ti.com: forward port commit '6d99f866952b' from upstream u-boot/next] Signed-off-by: Praneeth Bajjuri --- common/spl/spl_fit.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 55511a90d0..f711c8ef4f 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -282,6 +282,13 @@ static int spl_load_fit_image(struct spl_load_info *info, ulong sector, if (fit_image_get_data_size(fit, node, &len)) return -ENOENT; + /* Dont bother to copy 0 byte data, but warn, though */ + if (!len) { + log_warning("%s: Skip load '%s': image size is 0!\n", + __func__, fit_get_name(fit, node, NULL)); + return 0; + } + load_ptr = (load_addr + align_len) & ~align_len; length = len;