Browse Source

cgroup: allow NULL return from ss->css_alloc()

cgroup core expected css_alloc to return an ERR_PTR value on failure
and caused NULL deref if it returned NULL.  It's an easy mistake to
make from an alloc function and there's no ambiguity in what's being
indicated.  Update css_create() so that it interprets NULL return from
css_alloc as -ENOMEM.

Signed-off-by: Tejun Heo <tj@kernel.org>
Tejun Heo 9 years ago
parent
commit
e7e15b87f8
1 changed files with 2 additions and 0 deletions
  1. 2 0
      kernel/cgroup.c

+ 2 - 0
kernel/cgroup.c

@@ -5133,6 +5133,8 @@ static struct cgroup_subsys_state *css_create(struct cgroup *cgrp,
 	lockdep_assert_held(&cgroup_mutex);
 	lockdep_assert_held(&cgroup_mutex);
 
 
 	css = ss->css_alloc(parent_css);
 	css = ss->css_alloc(parent_css);
+	if (!css)
+		css = ERR_PTR(-ENOMEM);
 	if (IS_ERR(css))
 	if (IS_ERR(css))
 		return css;
 		return css;