From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Thu, 2 Jun 2022 15:51:17 +0000 (-0600)
Subject: wrapper: null terminated string in cgroup_add_controller()
X-Git-Tag: v3.0~65
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bcdc80a46273705b846a641f65d171540137a7cf;p=thirdparty%2Flibcgroup.git

wrapper: null terminated string in cgroup_add_controller()

Fix non-terminated string warning, reported by Coverity tool:

CID 258271 (#1 of 1): String not null terminated (STRING_NULL).
string_null: Passing unterminated string cgc->name to strcmp, which
expects a null-terminated string.

This issue was reported following the path src/abstraction-common.c:
- cgroup_convert_cgroup()
  - cgroup_add_controller()

Also, use CONTROL_NAMELEN_MAX macro, in place of calculating the size of
controller->name twice.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/wrapper.c b/src/wrapper.c
index 41eef292..933075df 100644
--- a/src/wrapper.c
+++ b/src/wrapper.c
@@ -78,7 +78,9 @@ struct cgroup_controller *cgroup_add_controller(struct cgroup *cgroup,
 	if (!controller)
 		return NULL;
 
-	strncpy(controller->name, name, sizeof(controller->name) - 1);
+	strncpy(controller->name, name, CONTROL_NAMELEN_MAX - 1);
+	controller->name[CONTROL_NAMELEN_MAX - 1] = '\0';
+
 	controller->cgroup = cgroup;
 	controller->index = 0;