aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLi Zefan <lizefan@huawei.com>2013-03-12 15:36:00 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-05-07 19:57:26 -0700
commited0a169166af3fc21e3b8ee9f3020298a93f9bd7 (patch)
treec9f7c1c62735be9eb758f57d0494f6928104ee95 /kernel
parent10eb78f693be5d924d8ae19264efc8da2d6cb8a3 (diff)
downloadkernel_samsung_smdk4412-ed0a169166af3fc21e3b8ee9f3020298a93f9bd7.zip
kernel_samsung_smdk4412-ed0a169166af3fc21e3b8ee9f3020298a93f9bd7.tar.gz
kernel_samsung_smdk4412-ed0a169166af3fc21e3b8ee9f3020298a93f9bd7.tar.bz2
cgroup: fix an off-by-one bug which may trigger BUG_ON()
commit 3ac1707a13a3da9cfc8f242a15b2fae6df2c5f88 upstream. The 3rd parameter of flex_array_prealloc() is the number of elements, not the index of the last element. The effect of the bug is, when opening cgroup.procs, a flex array will be allocated and all elements of the array is allocated with GFP_KERNEL flag, but the last one is GFP_ATOMIC, and if we fail to allocate memory for it, it'll trigger a BUG_ON(). Signed-off-by: Li Zefan <lizefan@huawei.com> Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/cgroup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c
index b964f9e..5d40afe 100644
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
@@ -2026,7 +2026,7 @@ int cgroup_attach_proc(struct cgroup *cgrp, struct task_struct *leader)
if (!group)
return -ENOMEM;
/* pre-allocate to guarantee space while iterating in rcu read-side. */
- retval = flex_array_prealloc(group, 0, group_size - 1, GFP_KERNEL);
+ retval = flex_array_prealloc(group, 0, group_size, GFP_KERNEL);
if (retval)
goto out_free_group_list;