forked from Minki/linux
mm: use vmalloc_array and vcalloc for array allocations
Instead of using array_size or just a multiply, use a function that takes care of both the multiplication and the overflow checks. Acked-by: Michal Hocko <mhocko@suse.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
a8749a35c3
commit
3000f2e2fc
@ -144,7 +144,7 @@ alloc_buffer:
|
||||
spin_unlock_irq(&pcpu_lock);
|
||||
|
||||
/* there can be at most this many free and allocated fragments */
|
||||
buffer = vmalloc(array_size(sizeof(int), (2 * max_nr_alloc + 1)));
|
||||
buffer = vmalloc_array(2 * max_nr_alloc + 1, sizeof(int));
|
||||
if (!buffer)
|
||||
return -ENOMEM;
|
||||
|
||||
|
@ -167,14 +167,12 @@ unsigned short lookup_swap_cgroup_id(swp_entry_t ent)
|
||||
int swap_cgroup_swapon(int type, unsigned long max_pages)
|
||||
{
|
||||
void *array;
|
||||
unsigned long array_size;
|
||||
unsigned long length;
|
||||
struct swap_cgroup_ctrl *ctrl;
|
||||
|
||||
length = DIV_ROUND_UP(max_pages, SC_PER_PAGE);
|
||||
array_size = length * sizeof(void *);
|
||||
|
||||
array = vzalloc(array_size);
|
||||
array = vcalloc(length, sizeof(void *));
|
||||
if (!array)
|
||||
goto nomem;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user