]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
tools/cgsnapshot: add ret value fix in parse_controllers()
authorKamalesh Babulal <kamalesh.babulal@oracle.com>
Wed, 20 Jul 2022 16:56:05 +0000 (10:56 -0600)
committerTom Hromatka <tom.hromatka@oracle.com>
Wed, 20 Jul 2022 16:56:10 +0000 (10:56 -0600)
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 <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
src/tools/cgsnapshot.c

index bd8c82c1696b7fb69799006c12b3a4b8cb9ca629..df4969275e522c17291cdb2d0f2ac0011b5abab0 100644 (file)
@@ -541,6 +541,8 @@ static int parse_controllers(cont_name_t cont_names[CG_CONTROLLER_MAX], const ch
                            (max != 0)) {
                                (controllers[max])[0] = '\0';
                                ret = display_controller_data(controllers, program_name);
+                               if (ret)
+                                       goto err;
                        }
 
                        strncpy(controllers[0], controller.name, FILENAME_MAX);
@@ -560,6 +562,7 @@ static int parse_controllers(cont_name_t cont_names[CG_CONTROLLER_MAX], const ch
                ret = display_controller_data(controllers, program_name);
        }
 
+err:
        cgroup_get_controller_end(&handle);
        if (ret != ECGEOF)
                return ret;