2.6.35-longterm review patch. If anyone has any objections, please let me know.
------------------ From: Li Zefan <[email protected]> commit b75f38d659e6fc747eda64cb72f3920e29dd44a4 upstream. Don't forget to release cgroup_mutex if alloc_trial_cpuset() fails. [[email protected]: avoid multiple return points] Signed-off-by: Li Zefan <[email protected]> Signed-off-by: Andi Kleen <[email protected]> Cc: Paul Menage <[email protected]> Acked-by: David Rientjes <[email protected]> Cc: Miao Xie <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- kernel/cpuset.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) Index: linux-2.6.35.y/kernel/cpuset.c =================================================================== --- linux-2.6.35.y.orig/kernel/cpuset.c 2011-03-29 22:50:54.764857122 -0700 +++ linux-2.6.35.y/kernel/cpuset.c 2011-03-29 23:03:01.845252954 -0700 @@ -1576,8 +1576,10 @@ return -ENODEV; trialcs = alloc_trial_cpuset(cs); - if (!trialcs) - return -ENOMEM; + if (!trialcs) { + retval = -ENOMEM; + goto out; + } switch (cft->private) { case FILE_CPULIST: @@ -1592,6 +1594,7 @@ } free_trial_cpuset(trialcs); +out: cgroup_unlock(); return retval; } _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
