From: Ahmad Fatoum <a.fatoum@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>,
Ahmad Fatoum <a.fatoum@pengutronix.de>
Subject: [PATCH 9/9] test: self: malloc: fix memory leaks
Date: Tue, 4 Oct 2022 17:54:07 +0200 [thread overview]
Message-ID: <20221004155405.3458479-10-a.fatoum@pengutronix.de> (raw)
In-Reply-To: <20221004155405.3458479-1-a.fatoum@pengutronix.de>
The test shouldn't leak memory, even if it fails. Fix the leaks.
Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
test/self/malloc.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/test/self/malloc.c b/test/self/malloc.c
index 6b3002ff0996..47c225ac6a10 100644
--- a/test/self/malloc.c
+++ b/test/self/malloc.c
@@ -85,7 +85,8 @@ static void test_malloc(void)
free(p);
if (mem_malloc_size) {
- expect_alloc_fail(malloc(SIZE_MAX));
+ tmp = expect_alloc_fail(malloc(SIZE_MAX));
+ free(tmp);
if (0xf0000000 > mem_malloc_size) {
tmp = expect_alloc_fail(malloc(0xf0000000));
@@ -95,7 +96,7 @@ static void test_malloc(void)
skipped_tests += 2;
}
- p = realloc(NULL, 1);
+ free(realloc(NULL, 1));
p = expect_alloc_ok(realloc(NULL, 1));
*p = 0x42;
@@ -107,11 +108,15 @@ static void test_malloc(void)
if (mem_malloc_size) {
tmp = expect_alloc_fail(realloc(p, mem_malloc_size));
+ free(tmp);
- if (0xf0000000 > mem_malloc_size)
+ if (0xf0000000 > mem_malloc_size) {
tmp = expect_alloc_fail(realloc(p, 0xf0000000));
+ free(tmp);
+ }
tmp = expect_alloc_fail(realloc(p, SIZE_MAX));
+ free(tmp);
} else {
skipped_tests += 3;
@@ -123,5 +128,8 @@ static void test_malloc(void)
tmp = expect_alloc_ok(malloc(0));
__expect_cond(p != tmp, true, "allocate distinct 0-size buffers", __func__, __LINE__);
+
+ free(p);
+ free(tmp);
}
bselftest(core, test_malloc);
--
2.30.2
next prev parent reply other threads:[~2022-10-04 15:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-04 15:53 [PATCH 0/9] tlsf: use 8-byte alignment for normal malloc allocations Ahmad Fatoum
2022-10-04 15:53 ` [PATCH 1/9] test: include <linux/printk.h> Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 2/9] tlsf: use bselftest for testing ffs/fls Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 3/9] tlsf: ensure malloc pool is aligned Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 4/9] tlsf: fix sizeof(size_t) == sizeof(void *) assumption Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 5/9] tlsf: decouple maximum allocation size from sizeof(size_t) Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 6/9] tlsf: use 8-byte alignment for normal malloc allocations Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 7/9] common: malloc: ensure alignment is always at least 8 byte Ahmad Fatoum
2022-10-04 15:54 ` [PATCH 8/9] test: self: refactor to allow alignment check Ahmad Fatoum
2022-10-04 15:54 ` Ahmad Fatoum [this message]
2022-10-04 16:23 ` [PATCH 0/9] tlsf: use 8-byte alignment for normal malloc allocations Enrico Scholz
2022-10-04 16:34 ` Ahmad Fatoum
2022-10-14 8:54 ` Sascha Hauer
2022-10-20 13:11 ` Ahmad Fatoum
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=20221004155405.3458479-10-a.fatoum@pengutronix.de \
--to=a.fatoum@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=enrico.scholz@sigma-chemnitz.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