[PATCH -next] genirq/msi: Use kmemdup_array() instead of kmemdup() for multiple allocation

Jinjie Ruan posted 1 patch 1 year, 3 months ago
kernel/irq/msi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[PATCH -next] genirq/msi: Use kmemdup_array() instead of kmemdup() for multiple allocation
Posted by Jinjie Ruan 1 year, 3 months ago
Let kmemdup_array() take care about multiplication and possible
overflows.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
---
 kernel/irq/msi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index ca6e2ae6d6fc..3a24d6b5f559 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -82,7 +82,7 @@ static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
 	desc->dev = dev;
 	desc->nvec_used = nvec;
 	if (affinity) {
-		desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL);
+		desc->affinity = kmemdup_array(affinity, nvec, sizeof(*desc->affinity), GFP_KERNEL);
 		if (!desc->affinity) {
 			kfree(desc);
 			return NULL;
-- 
2.34.1
[tip: irq/core] genirq/msi: Use kmemdup_array() instead of kmemdup()
Posted by tip-bot2 for Jinjie Ruan 1 year, 3 months ago
The following commit has been merged into the irq/core branch of tip:

Commit-ID:     bf1e0fb69a15fac4d6ee71d0e1c715147add986a
Gitweb:        https://git.kernel.org/tip/bf1e0fb69a15fac4d6ee71d0e1c715147add986a
Author:        Jinjie Ruan <ruanjinjie@huawei.com>
AuthorDate:    Wed, 28 Aug 2024 15:22:19 +08:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 29 Aug 2024 16:42:07 +02:00

genirq/msi: Use kmemdup_array() instead of kmemdup()

Let kmemdup_array() take care about sizing instead of doing it open coded.

Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20240828072219.1249250-1-ruanjinjie@huawei.com

---
 kernel/irq/msi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/irq/msi.c b/kernel/irq/msi.c
index 5fa0547..1c7e515 100644
--- a/kernel/irq/msi.c
+++ b/kernel/irq/msi.c
@@ -82,7 +82,7 @@ static struct msi_desc *msi_alloc_desc(struct device *dev, int nvec,
 	desc->dev = dev;
 	desc->nvec_used = nvec;
 	if (affinity) {
-		desc->affinity = kmemdup(affinity, nvec * sizeof(*desc->affinity), GFP_KERNEL);
+		desc->affinity = kmemdup_array(affinity, nvec, sizeof(*desc->affinity), GFP_KERNEL);
 		if (!desc->affinity) {
 			kfree(desc);
 			return NULL;