drivers/infiniband/hw/erdma/erdma_verbs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Replace vzalloc() with vcalloc() in vmalloc_to_dma_addrs(). As noted
in the kernel documentation [1], open-coded multiplication in allocator
arguments is discouraged because it can lead to integer overflow.
Use vcalloc() to gain built-in overflow protection, making memory
allocation safer when calculating allocation size compared to explicit
multiplication.
[1]: https://www.kernel.org/doc/html/next/process/deprecated.html#open-coded-arithmetic-in-allocator-arguments
Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
---
drivers/infiniband/hw/erdma/erdma_verbs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/infiniband/hw/erdma/erdma_verbs.c b/drivers/infiniband/hw/erdma/erdma_verbs.c
index 996860f49b2f..63cabb8a6d96 100644
--- a/drivers/infiniband/hw/erdma/erdma_verbs.c
+++ b/drivers/infiniband/hw/erdma/erdma_verbs.c
@@ -671,7 +671,7 @@ static u32 vmalloc_to_dma_addrs(struct erdma_dev *dev, dma_addr_t **dma_addrs,
npages = (PAGE_ALIGN((u64)buf + len) - PAGE_ALIGN_DOWN((u64)buf)) >>
PAGE_SHIFT;
- pg_dma = vzalloc(npages * sizeof(dma_addr_t));
+ pg_dma = vcalloc(npages, sizeof(dma_addr_t));
if (!pg_dma)
return 0;
--
2.34.1
> Replace vzalloc() with vcalloc() in vmalloc_to_dma_addrs(). … … > +++ b/drivers/infiniband/hw/erdma/erdma_verbs.c > @@ -671,7 +671,7 @@ static u32 vmalloc_to_dma_addrs(struct erdma_dev *dev, dma_addr_t **dma_addrs, > > npages = (PAGE_ALIGN((u64)buf + len) - PAGE_ALIGN_DOWN((u64)buf)) >> > PAGE_SHIFT; > - pg_dma = vzalloc(npages * sizeof(dma_addr_t)); > + pg_dma = vcalloc(npages, sizeof(dma_addr_t)); … How do you think about to adjust also the size determination? https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v6.17-rc2#n944 pg_dma = vcalloc(npages, sizeof(*pg_dma)); Regards, Markus
On 8/20/25 10:34 PM, Markus Elfring wrote: >> Replace vzalloc() with vcalloc() in vmalloc_to_dma_addrs(). … > > > > … >> +++ b/drivers/infiniband/hw/erdma/erdma_verbs.c >> @@ -671,7 +671,7 @@ static u32 vmalloc_to_dma_addrs(struct erdma_dev *dev, dma_addr_t **dma_addrs, >> >> npages = (PAGE_ALIGN((u64)buf + len) - PAGE_ALIGN_DOWN((u64)buf)) >> >> PAGE_SHIFT; >> - pg_dma = vzalloc(npages * sizeof(dma_addr_t)); >> + pg_dma = vcalloc(npages, sizeof(dma_addr_t)); > … > > How do you think about to adjust also the size determination? > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v6.17-rc2#n944 > > pg_dma = vcalloc(npages, sizeof(*pg_dma)); > Hi Qianfeng and Markus, Both your changes look good to me. Qianfeng, Could you send v2 including Markus's change? Thanks, Cheng Xu > > Regards, > Markus
在 2025/8/21 14:26, Cheng Xu 写道: > > On 8/20/25 10:34 PM, Markus Elfring wrote: >>> Replace vzalloc() with vcalloc() in vmalloc_to_dma_addrs(). … >> >> >> … >>> +++ b/drivers/infiniband/hw/erdma/erdma_verbs.c >>> @@ -671,7 +671,7 @@ static u32 vmalloc_to_dma_addrs(struct erdma_dev *dev, dma_addr_t **dma_addrs, >>> >>> npages = (PAGE_ALIGN((u64)buf + len) - PAGE_ALIGN_DOWN((u64)buf)) >> >>> PAGE_SHIFT; >>> - pg_dma = vzalloc(npages * sizeof(dma_addr_t)); >>> + pg_dma = vcalloc(npages, sizeof(dma_addr_t)); >> … >> >> How do you think about to adjust also the size determination? >> https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/coding-style.rst?h=v6.17-rc2#n944 >> >> pg_dma = vcalloc(npages, sizeof(*pg_dma)); >> > Hi Qianfeng and Markus, > > Both your changes look good to me. > > Qianfeng, Could you send v2 including Markus's change? Ok, I will release v2 with Markus's change later. > > Thanks, > Cheng Xu > >> Regards, >> Markus
© 2016 - 2025 Red Hat, Inc.