From: Haisu Wang <[email protected]> Replace uml_kmalloc() with uml_kmalloc_array() for multiplication.
Signed-off-by: Haisu Wang <[email protected]> --- arch/um/drivers/vector_user.c | 4 ++-- arch/um/drivers/vfio_user.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/um/drivers/vector_user.c b/arch/um/drivers/vector_user.c index 2ea67e6fd067..adc4280691cf 100644 --- a/arch/um/drivers/vector_user.c +++ b/arch/um/drivers/vector_user.c @@ -868,8 +868,8 @@ void *uml_vector_default_bpf(const void *mac) } else { return NULL; } - bpf = uml_kmalloc( - sizeof(struct sock_filter) * DEFAULT_BPF_LEN, UM_GFP_KERNEL); + bpf = uml_kmalloc_array(DEFAULT_BPF_LEN, sizeof(struct sock_filter), + UM_GFP_KERNEL); if (bpf) { bpf_prog->filter = bpf; /* ld [8] */ diff --git a/arch/um/drivers/vfio_user.c b/arch/um/drivers/vfio_user.c index 6a45d8e14582..4ad8c8c59e9d 100644 --- a/arch/um/drivers/vfio_user.c +++ b/arch/um/drivers/vfio_user.c @@ -194,7 +194,7 @@ int uml_vfio_user_setup_device(struct uml_vfio_user_device *dev, if (dev->num_regions > VFIO_PCI_CONFIG_REGION_INDEX + 1) dev->num_regions = VFIO_PCI_CONFIG_REGION_INDEX + 1; - dev->region = uml_kmalloc(sizeof(*dev->region) * dev->num_regions, + dev->region = uml_kmalloc_array(dev->num_regions, sizeof(*dev->region), UM_GFP_KERNEL); if (!dev->region) { err = -ENOMEM; @@ -223,7 +223,7 @@ int uml_vfio_user_setup_device(struct uml_vfio_user_device *dev, dev->irq_count = irq_info.count; - dev->irqfd = uml_kmalloc(sizeof(int) * dev->irq_count, UM_GFP_KERNEL); + dev->irqfd = uml_kmalloc_array(dev->irq_count, sizeof(int), UM_GFP_KERNEL); if (!dev->irqfd) { err = -ENOMEM; goto free_region; -- 2.52.0
