From: <jgkamat@fb.com>
To: <shuah@kernel.org>
Cc: <linux-kselftest@vger.kernel.org>, Roman Gushchin <guro@fb.com>,
Tejun Heo <tj@kernel.org>, <kernel-team@fb.com>,
<linux-kernel@vger.kernel.org>, <jaygkamat@gmail.com>,
<jgkamat@fb.com>
Subject: [PATCH 1/2] Fix cg_read_strcmp()
Date: Tue, 4 Sep 2018 18:08:26 -0700 [thread overview]
Message-ID: <20180905010827.27743-2-jgkamat@fb.com> (raw)
In-Reply-To: <20180905010827.27743-1-jgkamat@fb.com>
From: Jay Kamat <jgkamat@fb.com>
Fix a couple issues with cg_read_strcmp(), to improve correctness of
cgroup tests
- Fix cg_read_strcmp() always returning 0 for empty "needle" strings
- Fix a memory leak in cg_read_strcmp()
Fixes: 84092dbcf901 ("selftests: cgroup: add memory controller self-tests")
Signed-off-by: Jay Kamat <jgkamat@fb.com>
---
tools/testing/selftests/cgroup/cgroup_util.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c
index 1e9e3c470561..4aadf38bcd5d 100644
--- a/tools/testing/selftests/cgroup/cgroup_util.c
+++ b/tools/testing/selftests/cgroup/cgroup_util.c
@@ -91,15 +91,24 @@ int cg_read_strcmp(const char *cgroup, const char *control,
{
size_t size = strlen(expected) + 1;
char *buf;
+ int ret;
+
+ /* Handle the case of comparing against empty string */
+ if (size == 1)
+ size = 32;
buf = malloc(size);
if (!buf)
return -1;
- if (cg_read(cgroup, control, buf, size))
+ if (cg_read(cgroup, control, buf, size)) {
+ free(buf);
return -1;
+ }
- return strcmp(expected, buf);
+ ret = strcmp(expected, buf);
+ free(buf);
+ return ret;
}
int cg_read_strstr(const char *cgroup, const char *control, const char *needle)
--
2.17.1
next prev parent reply other threads:[~2018-09-05 1:12 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-05 1:08 kselftests for memory.oom.group jgkamat
2018-09-05 1:08 ` jgkamat [this message]
2018-09-05 14:43 ` [PATCH 1/2] Fix cg_read_strcmp() Shuah Khan
2018-09-05 1:08 ` [PATCH 2/2] Add tests for memory.oom.group jgkamat
2018-09-05 15:21 ` Shuah Khan
2018-09-07 16:49 ` kselftests " jgkamat
2018-09-07 16:49 ` [PATCH 1/2] Fix cg_read_strcmp() jgkamat
2018-09-07 16:56 ` Roman Gushchin
2018-09-07 17:06 ` Shuah Khan
2018-09-07 18:28 ` Jay Kamat
2018-09-07 18:53 ` Shuah Khan
2018-09-07 16:49 ` [PATCH 2/2] Add tests for memory.oom.group jgkamat
2018-09-07 16:57 ` Roman Gushchin
2018-09-07 21:34 ` kselftests " jgkamat
2018-09-07 21:34 ` [PATCH v3 1/2] Fix cg_read_strcmp() jgkamat
2018-09-07 21:34 ` [PATCH v3 2/2] Add tests for memory.oom.group jgkamat
2018-09-07 22:53 ` kselftests " Shuah Khan
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=20180905010827.27743-2-jgkamat@fb.com \
--to=jgkamat@fb.com \
--cc=guro@fb.com \
--cc=jaygkamat@gmail.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=shuah@kernel.org \
--cc=tj@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;
as well as URLs for NNTP newsgroup(s).