U-Boot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: ant.v.moryakov@gmail.com
To: u-boot@lists.denx.de
Cc: Maks Mishin <maks.mishinFZ@gmail.com>
Subject: [PATCH] tools: Fix memory and descriptor leak
Date: Fri, 18 Apr 2025 11:19:56 +0300	[thread overview]
Message-ID: <20250418081958.12818-2-ant.v.moryakov@gmail.com> (raw)
In-Reply-To: <20250418081958.12818-1-ant.v.moryakov@gmail.com>

From: Maks Mishin <maks.mishinFZ@gmail.com>

Signed-off-by: Maks Mishin <maks.mishinFZ@gmail.com>
---
 tools/zynqmpbif.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/zynqmpbif.c b/tools/zynqmpbif.c
index 82ce0ac1..76b7a35f 100644
--- a/tools/zynqmpbif.c
+++ b/tools/zynqmpbif.c
@@ -226,8 +226,10 @@ static char *read_full_file(const char *filename, size_t *size)
 	bufp = buf;
 	while (len < sbuf.st_size) {
 		r = read(fd, bufp, sbuf.st_size - len);
-		if (r < 0)
+		if (r < 0) {
+			free(buf);
 			return NULL;
+		}
 		len += r;
 		bufp += r;
 	}
@@ -793,6 +795,8 @@ static const struct bif_file_type *get_file_type(struct bif_entry *entry)
 
 	if (read(fd, &header, sizeof(header)) != sizeof(header)) {
 		printf("Error reading file %s", entry->filename);
+		if (fd)
+			close(fd);
 		return NULL;
 	}
 
-- 
2.34.1

  reply	other threads:[~2025-04-18  8:20 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-18  8:19 [PATCH] scripts: Fix potential null-deref ant.v.moryakov
2025-04-18  8:19 ` ant.v.moryakov [this message]
2025-04-18 13:51   ` [PATCH] tools: Fix memory and descriptor leak Quentin Schulz
2025-04-18  8:19 ` [PATCH] tools: Fix potential memory leak in aisimage.c ant.v.moryakov
2025-04-18 13:52   ` Quentin Schulz
2025-04-18  8:19 ` [PATCH] tools: image-host: Fix potential memory leak ant.v.moryakov
2025-04-18 13:52   ` Quentin Schulz
2025-04-18 13:51 ` [PATCH] scripts: Fix potential null-deref Quentin Schulz
2025-04-18 14:18   ` Tom Rini
  -- strict thread matches above, loose matches on Subject: below --
2025-04-18 18:21 [PATCH] tools: Fix memory and descriptor leak ant.v.moryakov

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=20250418081958.12818-2-ant.v.moryakov@gmail.com \
    --to=ant.v.moryakov@gmail.com \
    --cc=maks.mishinFZ@gmail.com \
    --cc=u-boot@lists.denx.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