From: Malaya Kumar Rout <malayarout91@gmail.com>
To: malayarout91@gmail.com
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>, Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
x86@kernel.org, "H. Peter Anvin" <hpa@zytor.com>,
Shuah Khan <shuah@kernel.org>,
linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org
Subject: [PATCH] selftests/x86/lam: fix memory leak and resource leak in lam.c
Date: Mon, 24 Mar 2025 18:17:50 +0530 [thread overview]
Message-ID: <20250324124810.883767-1-malayarout91@gmail.com> (raw)
In-Reply-To: <malayarout91@gmail.com>
Static Analyis for bench_htab_mem.c with cppcheck:error
tools/testing/selftests/x86/lam.c:585:3:
error: Resource leak: file_fd [resourceLeak]
tools/testing/selftests/x86/lam.c:593:3:
error: Resource leak: file_fd [resourceLeak]
tools/testing/selftests/x86/lam.c:600:3:
error: Memory leak: fi [memleak]
tools/testing/selftests/x86/lam.c:1066:2:
error: Resource leak: fd [resourceLeak]
fix the issue by closing the file descriptors and
releasing the allocated memory.
Signed-off-by: Malaya Kumar Rout <malayarout91@gmail.com>
---
tools/testing/selftests/x86/lam.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/tools/testing/selftests/x86/lam.c b/tools/testing/selftests/x86/lam.c
index 4d4a76532dc9..0b43b83ad142 100644
--- a/tools/testing/selftests/x86/lam.c
+++ b/tools/testing/selftests/x86/lam.c
@@ -581,24 +581,28 @@ int do_uring(unsigned long lam)
if (file_fd < 0)
return 1;
- if (fstat(file_fd, &st) < 0)
+ if (fstat(file_fd, &st) < 0) {
+ close(file_fd);
return 1;
-
+ }
off_t file_sz = st.st_size;
int blocks = (int)(file_sz + URING_BLOCK_SZ - 1) / URING_BLOCK_SZ;
fi = malloc(sizeof(*fi) + sizeof(struct iovec) * blocks);
- if (!fi)
+ if (!fi) {
+ close(file_fd);
return 1;
-
+ }
fi->file_sz = file_sz;
fi->file_fd = file_fd;
ring = malloc(sizeof(*ring));
- if (!ring)
+ if (!ring) {
+ close(file_fd);
+ free(fi);
return 1;
-
+ }
memset(ring, 0, sizeof(struct io_ring));
if (setup_io_uring(ring))
@@ -1060,8 +1064,10 @@ void *allocate_dsa_pasid(void)
wq = mmap(NULL, 0x1000, PROT_WRITE,
MAP_SHARED | MAP_POPULATE, fd, 0);
- if (wq == MAP_FAILED)
+ if (wq == MAP_FAILED) {
+ close(fd);
perror("mmap");
+ }
return wq;
}
--
2.43.0
next reply other threads:[~2025-03-24 12:48 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-24 12:47 Malaya Kumar Rout [this message]
2025-03-24 12:51 ` [PATCH] selftests/x86/lam: fix memory leak and resource leak in lam.c Peter Zijlstra
2025-03-25 9:29 ` Ingo Molnar
2025-03-25 9:56 ` malaya kumar rout
2025-03-25 13:25 ` Malaya Kumar Rout
2025-04-07 10:44 ` [PATCH v2] selftests/x86/lam: fix resource leak in do_uring() and allocate_dsa_pasid() Malaya Kumar Rout
2025-04-07 18:20 ` Ingo Molnar
2025-04-07 19:34 ` [PATCH v3] " Malaya Kumar Rout
2025-04-08 8:09 ` Ingo Molnar
2025-04-08 18:52 ` RE:[PATCH RESEND x86-next v4] " Malaya Kumar Rout
2025-04-08 20:12 ` [PATCH " Ingo Molnar
2025-04-09 13:53 ` [PATCH " Malaya Kumar Rout
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=20250324124810.883767-1-malayarout91@gmail.com \
--to=malayarout91@gmail.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=shuah@kernel.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.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