diff options
author | Li Zefan <lizefan@huawei.com> | 2013-03-12 15:36:00 -0700 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-03-20 07:50:04 -0700 |
commit | 3ac1707a13a3da9cfc8f242a15b2fae6df2c5f88 (patch) | |
tree | 2697a8fe41fcd9e5b31f5c3582fbfb2cdbdd58bf /kernel/cgroup.c | |
parent | 80f36c2a1a612ca419e5b864a7e4808e797d9feb (diff) | |
download | blackbird-op-linux-3ac1707a13a3da9cfc8f242a15b2fae6df2c5f88.tar.gz blackbird-op-linux-3ac1707a13a3da9cfc8f242a15b2fae6df2c5f88.zip |
cgroup: fix an off-by-one bug which may trigger BUG_ON()
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>
Cc: stable@vger.kernel.org
Diffstat (limited to 'kernel/cgroup.c')
-rw-r--r-- | kernel/cgroup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/cgroup.c b/kernel/cgroup.c index c7fe303b5109..54689fc008f6 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2076,7 +2076,7 @@ static 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; |