linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
From: Feng Jiang <jiangfeng@kylinos.cn>
To: akpm@linux-foundation.org, shuah@kernel.org
Cc: linux-mm@kvack.org, linux-kselftest@vger.kernel.org,
	linux-kernel@vger.kernel.org, Feng Jiang <jiangfeng@kylinos.cn>,
	Ming Xie <xieming@kylinos.cn>
Subject: [PATCH] selftests/mm: fix resource leaks in child_vmsplice_memcmp_fn
Date: Tue,  4 Apr 2023 11:12:56 +0800	[thread overview]
Message-ID: <20230404031256.78330-1-jiangfeng@kylinos.cn> (raw)

When the function returns, the 'new' and 'old' are not freed
and the 'fds[]' are not closed, which can lead to resource leaks.

Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
Suggested-by: Ming Xie <xieming@kylinos.cn>
---
 tools/testing/selftests/mm/cow.c | 43 ++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/tools/testing/selftests/mm/cow.c b/tools/testing/selftests/mm/cow.c
index c0dd2dfca51b..b8aec05d56f4 100644
--- a/tools/testing/selftests/mm/cow.c
+++ b/tools/testing/selftests/mm/cow.c
@@ -193,26 +193,38 @@ static int child_vmsplice_memcmp_fn(char *mem, size_t size,
 	char *old, *new;
 	int fds[2];
 	char buf;
+	int ret;
 
 	old = malloc(size);
 	new = malloc(size);
+	if (!old || !new) {
+		ret = -ENOMEM;
+		goto free;
+	}
 
 	/* Backup the original content. */
 	memcpy(old, mem, size);
 
-	if (pipe(fds) < 0)
-		return -errno;
+	if (pipe(fds) < 0) {
+		ret = -errno;
+		goto free;
+	}
 
 	/* Trigger a read-only pin. */
 	transferred = vmsplice(fds[1], &iov, 1, 0);
-	if (transferred < 0)
-		return -errno;
-	if (transferred == 0)
-		return -EINVAL;
+	if (transferred < 0) {
+		ret = -errno;
+		goto close_pipe;
+	} else if (transferred == 0) {
+		ret = -EINVAL;
+		goto close_pipe;
+	}
 
 	/* Unmap it from our page tables. */
-	if (munmap(mem, size) < 0)
-		return -errno;
+	if (munmap(mem, size) < 0) {
+		ret = -errno;
+		goto close_pipe;
+	}
 
 	/* Wait until the parent modified it. */
 	write(comm_pipes->child_ready[1], "0", 1);
@@ -222,11 +234,20 @@ static int child_vmsplice_memcmp_fn(char *mem, size_t size,
 	/* See if we still read the old values via the pipe. */
 	for (total = 0; total < transferred; total += cur) {
 		cur = read(fds[0], new + total, transferred - total);
-		if (cur < 0)
-			return -errno;
+		if (cur < 0) {
+			ret = -errno;
+			goto close_pipe;
+		}
 	}
 
-	return memcmp(old, new, transferred);
+	ret = memcmp(old, new, transferred);
+close_pipe:
+	close(fds[0]);
+	close(fds[1]);
+free:
+	free(old);
+	free(new);
+	return ret;
 }
 
 typedef int (*child_fn)(char *mem, size_t size, struct comm_pipes *comm_pipes);
-- 
2.39.2



             reply	other threads:[~2023-04-04  3:13 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-04-04  3:12 Feng Jiang [this message]
2023-04-04  7:31 ` David Hildenbrand

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=20230404031256.78330-1-jiangfeng@kylinos.cn \
    --to=jiangfeng@kylinos.cn \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-kselftest@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=shuah@kernel.org \
    --cc=xieming@kylinos.cn \
    /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