From 381834ed04ff4a6e7ad16aa84df5ee6581fae815 Mon Sep 17 00:00:00 2001 From: Kamalesh Babulal Date: Wed, 20 Jul 2022 11:00:38 -0600 Subject: [PATCH] tools/cgsnapshot: add ret value fix in parse_controllers() Fix the unused ret value warning, reported by Coverity: CID 258275 (#1 of 1): Unused value (UNUSED_VALUE)returned_value: Assigning value from display_controller_data(controllers, program_name) to ret here, but that stored value is overwritten before it can be used. The parse_controllers(), doesn't check for errors in the value returned by display_controller_data(). The return value might very well contain an error, that might go unnoticed. Fix it by adding a check for the return value. Signed-off-by: Kamalesh Babulal Signed-off-by: Tom Hromatka (cherry picked from commit f2f107c8b3ef0f699c0a3f77aeebbcbeb4f1b8b1) --- src/tools/cgsnapshot.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/tools/cgsnapshot.c b/src/tools/cgsnapshot.c index 0165a469..e20b6cb5 100644 --- a/src/tools/cgsnapshot.c +++ b/src/tools/cgsnapshot.c @@ -570,6 +570,8 @@ static int parse_controllers(cont_name_t cont_names[CG_CONTROLLER_MAX], (controllers[max])[0] = '\0'; ret = display_controller_data( controllers, program_name); + if (ret) + goto err; } strncpy(controllers[0], controller.name, FILENAME_MAX); @@ -592,6 +594,7 @@ static int parse_controllers(cont_name_t cont_names[CG_CONTROLLER_MAX], controllers, program_name); } +err: cgroup_get_controller_end(&handle); if (ret != ECGEOF) return ret; -- 2.47.2