mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Ulrich Ölmann" <u.oelmann@pengutronix.de>
To: Barebox List <barebox@lists.infradead.org>
Subject: [PATCH] state: backend_bucket_circular: fix memory leak
Date: Mon,  8 Oct 2018 19:45:23 +0200	[thread overview]
Message-ID: <20181008174523.25757-1-u.oelmann@pengutronix.de> (raw)

Signed-off-by: Ulrich Ölmann <u.oelmann@pengutronix.de>
---
 common/state/backend_bucket_circular.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/common/state/backend_bucket_circular.c b/common/state/backend_bucket_circular.c
index 0529421a2c2f..277b94d79737 100644
--- a/common/state/backend_bucket_circular.c
+++ b/common/state/backend_bucket_circular.c
@@ -480,7 +480,8 @@ int state_backend_bucket_circular_create(struct device_d *dev, const char *path,
 	circ->fd = open(path, O_RDWR);
 	if (circ->fd < 0) {
 		pr_err("Failed to open circular bucket '%s'\n", path);
-		return -errno;
+		ret = -errno;
+		goto out_free;
 	}
 #endif
 
@@ -489,7 +490,7 @@ int state_backend_bucket_circular_create(struct device_d *dev, const char *path,
 		dev_info(dev, "Not using eraseblock %u, it is marked as bad (%d)\n",
 			 circ->eraseblock, ret);
 		ret = -EIO;
-		goto out_free;
+		goto out_close;
 	}
 
 	circ->bucket.read = state_backend_bucket_circular_read;
@@ -499,13 +500,15 @@ int state_backend_bucket_circular_create(struct device_d *dev, const char *path,
 
 	ret = state_backend_bucket_circular_init(*bucket);
 	if (ret)
-		goto out_free;
+		goto out_close;
 
 	return 0;
 
-out_free:
+out_close:
 #ifndef __BAREBOX__
 	close(circ->fd);
+out_free:
+	free(circ->mtd);
 #endif
 	free(circ);
 
-- 
2.19.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2018-10-08 17:45 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-08 17:45 Ulrich Ölmann [this message]
2018-10-10  5:40 ` Sascha Hauer

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=20181008174523.25757-1-u.oelmann@pengutronix.de \
    --to=u.oelmann@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /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