[PATCH] cgroup:cgroup_mount: Fix uninitialized warning

* [PATCH] cgroup:cgroup_mount: Fix uninitialized warning
@ 2014-04-19 12:52 Takeshi Misawa
       [not found] ` <CABYERD89BtTTJh8j0d0kvCU-xNEy8YJhFaPFr+hjuy5gWQoVNg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Takeshi Misawa @ 2014-04-19 12:52 UTC (permalink / raw)
  To: tj-DgEjT+Ai2ygdnm+yROfE0A, lizefan-hv44wF8Li93QT0dZR+AlfA
  Cc: cgroups-u79uwXL29TY76Z2rM5mHXA,
	containers-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA,
	linux-kernel-u79uwXL29TY76Z2rM5mHXA, Takeshi Misawa

This patch fixes the following warning.

kernel/cgroup.c: In function ‘cgroup_mount’:
kernel/cgroup.c:1609:13: warning: ‘root’ may be used uninitialized in this
function

Signed-off-by: Takeshi Misawa <jeantsuru@gmail.com>
---
 kernel/cgroup.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index 9fcdaa7..ba03421 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -1483,7 +1483,7 @@ static struct dentry *cgroup_mount(struct
file_system_type *fs_type,
                         int flags, const char *unused_dev_name,
                         void *data)
 {
-       struct cgroup_root *root;
+       struct cgroup_root *root = NULL;
        struct cgroup_sb_opts opts;
        struct dentry *dentry;
        int ret;
@@ -1604,6 +1604,11 @@ out_unlock:
        if (ret)
                return ERR_PTR(ret);

+       if (!root) {
+               if (!ret) ret = -EINVAL;
+               return ERR_PTR(ret);
+       }
+
        dentry = kernfs_mount(fs_type, flags, root->kf_root, &new_sb);
        if (IS_ERR(dentry) || !new_sb)
                cgroup_put(&root->cgrp);
_______________________________________________
Containers mailing list
Containers@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/containers

^ permalink raw reply related	[flat|nested] 3+ messages in thread