diff options
author | Li Zefan <lizefan@huawei.com> | 2013-03-12 15:36:00 -0700 |
---|---|---|
committer | Ben Hutchings <ben@decadent.org.uk> | 2013-05-13 15:02:11 +0100 |
commit | f596ca6c42fc4a8bb8269684ad2b839d78f684eb (patch) | |
tree | 737fd5ca927a75c79ee33d35e87490c86433ee8c /kernel/cgroup.c | |
parent | 6d895982c8155fca39e857dd9777171e4747d4da (diff) | |
download | kernel_samsung_smdk4412-f596ca6c42fc4a8bb8269684ad2b839d78f684eb.zip kernel_samsung_smdk4412-f596ca6c42fc4a8bb8269684ad2b839d78f684eb.tar.gz kernel_samsung_smdk4412-f596ca6c42fc4a8bb8269684ad2b839d78f684eb.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: Ben Hutchings <ben@decadent.org.uk>
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 c0739f8..d2a01fe 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -2029,7 +2029,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; |