qiurui
/
Centos-kernel-stream-9
mirror of https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mm: use vmalloc_array and vcalloc for array allocations 

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2057367
Upstream Status: https://git.kernel.org/pub/scm/virt/kvm/kvm.git/

commit 3000f2e2fc855664c28d3e6a47e0373737974eb4
Author: Paolo Bonzini <pbonzini@redhat.com>
Date:   Tue Mar 8 05:02:21 2022 -0500

    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>

Signed-off-by: David Hildenbrand <david@redhat.com>
This commit is contained in:
David Hildenbrand 2022-03-16 12:20:11 +01:00
parent 1553ca7dc1
commit 58751a5691
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mm/percpu-stats.c
View File

@ -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;

4
mm/swap_cgroup.c
View File

@ -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;