kselftest/cgroup: fix variable dereferenced before check warning
diff mbox

Message ID 20180522101031.8451-1-guro@fb.com
State Accepted
Headers show

Commit Message

Roman Gushchin May 22, 2018, 10:10 a.m. UTC
cg_name(const char *root, const char *name) is always called with
non-empty root and name arguments, so there is no sense in checking
it in the function body (after using in strlen()).

Signed-off-by: Roman Gushchin <guro@fb.com>
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: linux-kselftest@vger.kernel.org
---
 tools/testing/selftests/cgroup/cgroup_util.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

Comments

shuah May 22, 2018, 3:35 p.m. UTC | #1
On 05/22/2018 04:10 AM, Roman Gushchin wrote:
> cg_name(const char *root, const char *name) is always called with
> non-empty root and name arguments, so there is no sense in checking
> it in the function body (after using in strlen()).
> 
> Signed-off-by: Roman Gushchin <guro@fb.com>
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Cc: linux-kselftest@vger.kernel.org


Thanks. I will queue this up for 4.18-rc1

-- Shuah

--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/tools/testing/selftests/cgroup/cgroup_util.c b/tools/testing/selftests/cgroup/cgroup_util.c
index 41cc3b5e5be1..b69bdeb4b9fe 100644
--- a/tools/testing/selftests/cgroup/cgroup_util.c
+++ b/tools/testing/selftests/cgroup/cgroup_util.c
@@ -59,8 +59,7 @@  char *cg_name(const char *root, const char *name)
 	size_t len = strlen(root) + strlen(name) + 2;
 	char *ret = malloc(len);
 
-	if (name)
-		snprintf(ret, len, "%s/%s", root, name);
+	snprintf(ret, len, "%s/%s", root, name);
 
 	return ret;
 }
@@ -70,8 +69,7 @@  char *cg_name_indexed(const char *root, const char *name, int index)
 	size_t len = strlen(root) + strlen(name) + 10;
 	char *ret = malloc(len);
 
-	if (name)
-		snprintf(ret, len, "%s/%s_%d", root, name, index);
+	snprintf(ret, len, "%s/%s_%d", root, name, index);
 
 	return ret;
 }