]> git.ipfire.org Git - thirdparty/libcgroup.git/commitdiff
cgconfig: add err check
authorLibo Chen <libo.chen@huawei.com>
Tue, 10 Sep 2013 06:13:56 +0000 (08:13 +0200)
committerLibo Chen <libo.chen@huawei.com>
Tue, 10 Sep 2013 06:13:56 +0000 (08:13 +0200)
cgroup still can be created even if giving invalid -d,-f,-s parameter.
e.g.
        cgconfigparser  -d 888 -l /etc/cgconfig.conf
        "888" is invalid, but cgroup will be created.

        So we should exit when -d,-f or -s is invalid.

v3:
 - add nonzero return value
 - use error instead of ret

Signed-off-by: Libo Chen <clbchenlibo.chen@huawei.com>
Acked-by: Ivana Hutarova Varekova <varekova@redhat.com>
src/tools/cgconfig.c

index 6aeea0f3663f2b4dfdeea0644441eef71b73af72..81d07c991a9f100da2139122d005d276ccf17909 100644 (file)
@@ -121,15 +121,21 @@ int main(int argc, char *argv[])
                        break;
                case 'd':
                        dirm_change = 1;
-                       ret = parse_mode(optarg, &dir_mode, argv[0]);
+                       error = parse_mode(optarg, &dir_mode, argv[0]);
+                       if (error)
+                               goto err;
                        break;
                case 'f':
                        filem_change = 1;
-                       ret = parse_mode(optarg, &file_mode, argv[0]);
+                       error = parse_mode(optarg, &file_mode, argv[0]);
+                       if (error)
+                               goto err;
                        break;
                case 's':
                        filem_change = 1;
-                       ret = parse_mode(optarg, &tasks_mode, argv[0]);
+                       error = parse_mode(optarg, &tasks_mode, argv[0]);
+                       if (error)
+                               goto err;
                        break;
                default:
                        usage(argv[0]);