diff options
| author | Milton Miller <miltonm@bga.com> | 2007-10-15 17:00:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2007-10-15 17:00:19 +0200 |
| commit | 5cf9f062c8e33d5a09eaa447550330162b2a96ed (patch) | |
| tree | 93095cd5531605db4084a5189fef41ef4e36d3cb /kernel | |
| parent | 0dbee3a6b006dbe814d002cb18e94bf24a216451 (diff) | |
sched: domain sysctl fixes: use kcalloc()
kcalloc checks for n * sizeof(element) overflows and it zeros.
Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 750612751a7..d29950a6041 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -5243,10 +5243,9 @@ static struct ctl_table sd_ctl_root[] = { static struct ctl_table *sd_alloc_ctl_entry(int n) { struct ctl_table *entry = - kmalloc(n * sizeof(struct ctl_table), GFP_KERNEL); + kcalloc(n, sizeof(struct ctl_table), GFP_KERNEL); BUG_ON(!entry); - memset(entry, 0, n * sizeof(struct ctl_table)); return entry; } @@ -6018,7 +6017,7 @@ static int build_sched_domains(const cpumask_t *cpu_map) /* * Allocate the per-node list of sched groups */ - sched_group_nodes = kzalloc(sizeof(struct sched_group *)*MAX_NUMNODES, + sched_group_nodes = kcalloc(MAX_NUMNODES, sizeof(struct sched_group *), GFP_KERNEL); if (!sched_group_nodes) { printk(KERN_WARNING "Can not alloc sched group node list\n"); |