luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kernel/taskstats.c: return -ENOMEM when alloc memory fails in add_del_listener()

Browse Source 
For registering in add_del_listener(), when kmalloc_node() fails, need
return -ENOMEM instead of success code, and cmd_attr_register_cpumask()
wants to know about it.

After modification, give a simple common test "build -> boot up ->
kernel/controllers/cgroup/getdelays by LTP tools".

Signed-off-by: Chen Gang <gang.chen@asianux.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Chen Gang 2013-11-12 15:11:23 -08:00 committed by Linus Torvalds
parent 3fa5826631
commit 0d20633b04
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kernel/taskstats.c
View File

@ -290,6 +290,7 @@ static int add_del_listener(pid_t pid, const struct cpumask *mask, int isadd)
struct listener_list *listeners; struct listener_list *listeners;
struct listener *s, *tmp, *s2; struct listener *s, *tmp, *s2;
unsigned int cpu; unsigned int cpu;
int ret = 0;
if (!cpumask_subset(mask, cpu_possible_mask)) if (!cpumask_subset(mask, cpu_possible_mask))
return -EINVAL; return -EINVAL;
@ -304,9 +305,10 @@ static int add_del_listener(pid_t pid, const struct cpumask *mask, int isadd)
for_each_cpu(cpu, mask) { for_each_cpu(cpu, mask) {
s = kmalloc_node(sizeof(struct listener), s = kmalloc_node(sizeof(struct listener),
GFP_KERNEL, cpu_to_node(cpu)); GFP_KERNEL, cpu_to_node(cpu));
if (!s) if (!s) {
ret = -ENOMEM;
goto cleanup; goto cleanup;
}
s->pid = pid; s->pid = pid;
s->valid = 1; s->valid = 1;
@ -339,7 +341,7 @@ static int add_del_listener(pid_t pid, const struct cpumask *mask, int isadd)
} }
up_write(&listeners->sem); up_write(&listeners->sem);
} }
return 0; return ret;
} }
static int parse(struct nlattr *na, struct cpumask *mask) static int parse(struct nlattr *na, struct cpumask *mask)