Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

cpumask: fix slab corruption caused by alloc_cpumask_var_node()

Fix slab corruption caused by alloc_cpumask_var_node() overwriting the
tail end of an off-stack cpumask.

The function zeros out cpumask bits beyond the last possible cpu. The
starting point for zeroing should be the beginning of the mask offset by a
byte count derived from the number of possible cpus. The offset was
calculated in bits instead of bytes. This resulted in overwriting the end
of the cpumask.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Acked-by: Mike Travis <travis.sgi.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <stable@kernel.org> [2.6.29.x]
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Jack Steiner and committed by
Linus Torvalds
4f032ac4 2d09cde9

+2 -2
+2 -2
lib/cpumask.c
··· 109 109 #endif 110 110 /* FIXME: Bandaid to save us from old primitives which go to NR_CPUS. */ 111 111 if (*mask) { 112 + unsigned char *ptr = (unsigned char *)cpumask_bits(*mask); 112 113 unsigned int tail; 113 114 tail = BITS_TO_LONGS(NR_CPUS - nr_cpumask_bits) * sizeof(long); 114 - memset(cpumask_bits(*mask) + cpumask_size() - tail, 115 - 0, tail); 115 + memset(ptr + cpumask_size() - tail, 0, tail); 116 116 } 117 117 118 118 return *mask != NULL;