From: Dan Carpenter <dan.carpenter@oracle.com>
To: Yosry Ahmed <yosryahmed@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>,
Michal Hocko <mhocko@kernel.org>,
Roman Gushchin <roman.gushchin@linux.dev>,
Shakeel Butt <shakeelb@google.com>,
Muchun Song <songmuchun@bytedance.com>, Tejun Heo <tj@kernel.org>,
Zefan Li <lizefan.x@bytedance.com>, Shuah Khan <shuah@kernel.org>,
David Rientjes <rientjes@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
cgroups@vger.kernel.org, linux-mm@kvack.org,
linux-kselftest@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: [PATCH] selftests: memcg: uninitialized variable in test_memcg_reclaim()
Date: Tue, 19 Jul 2022 12:46:10 +0300 [thread overview]
Message-ID: <YtZ9Yu6HSQ2sT+O/@kili> (raw)
The "fd" is used on the clean up path without ever being initialized.
Fixes: eae3cb2e87ff ("selftests: cgroup: add a selftest for memory.reclaim")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
I kind of went over kill on fixing this as if it were real code which
matters. :P
.../selftests/cgroup/test_memcontrol.c | 23 +++++++++++--------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c
index 8833359556f3..08681699c2f9 100644
--- a/tools/testing/selftests/cgroup/test_memcontrol.c
+++ b/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -658,18 +658,18 @@ static int test_memcg_reclaim(const char *root)
memcg = cg_name(root, "memcg_test");
if (!memcg)
- goto cleanup;
+ return KSFT_FAIL;
if (cg_create(memcg))
- goto cleanup;
+ goto free_memcg;
current = cg_read_long(memcg, "memory.current");
if (current != 0)
- goto cleanup;
+ goto destroy_memcg;
fd = get_temp_fd();
if (fd < 0)
- goto cleanup;
+ goto destroy_memcg;
cg_run_nowait(memcg, alloc_pagecache_50M_noexit, (void *)(long)fd);
@@ -697,7 +697,7 @@ static int test_memcg_reclaim(const char *root)
fprintf(stderr,
"failed to allocate %ld for memcg reclaim test\n",
expected_usage);
- goto cleanup;
+ goto close;
}
}
@@ -717,7 +717,7 @@ static int test_memcg_reclaim(const char *root)
* not reclaim the full amount.
*/
if (to_reclaim <= 0)
- goto cleanup;
+ goto close;
snprintf(buf, sizeof(buf), "%ld", to_reclaim);
@@ -729,7 +729,7 @@ static int test_memcg_reclaim(const char *root)
*/
current = cg_read_long(memcg, "memory.current");
if (!values_close(current, MB(30), 3) && current > MB(30))
- goto cleanup;
+ goto close;
break;
}
@@ -738,14 +738,17 @@ static int test_memcg_reclaim(const char *root)
continue;
/* We got an unexpected error or ran out of retries. */
- goto cleanup;
+ goto close;
}
ret = KSFT_PASS;
-cleanup:
+
+close:
+ close(fd);
+destroy_memcg:
cg_destroy(memcg);
+free_memcg:
free(memcg);
- close(fd);
return ret;
}
--
2.35.1
next reply other threads:[~2022-07-19 9:46 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-19 9:46 Dan Carpenter [this message]
2022-07-19 17:27 ` Yosry Ahmed
2022-07-20 9:29 ` Dan Carpenter
2022-07-20 17:35 ` Yosry Ahmed
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=YtZ9Yu6HSQ2sT+O/@kili \
--to=dan.carpenter@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=cgroups@vger.kernel.org \
--cc=hannes@cmpxchg.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lizefan.x@bytedance.com \
--cc=mhocko@kernel.org \
--cc=rientjes@google.com \
--cc=roman.gushchin@linux.dev \
--cc=shakeelb@google.com \
--cc=shuah@kernel.org \
--cc=songmuchun@bytedance.com \
--cc=tj@kernel.org \
--cc=yosryahmed@google.com \
/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