Skip to contentSkip to conversation

staging: media: atomisp: use kmalloc_array() for sh_css_blob_info

PATCH Superseded Lin YuChen 2 participants 4 messages Mar 13

Subsystems (4)
lore
Share & tools
lore

Lin YuChen

author
#0 lore raw

PATCH 2/2 staging: media: atomisp: use kmalloc_array() for sh_css_blob_info

Replace the open-coded multiplication in kmalloc() with kmalloc_array() to provide overflow protection and improve code readability.

---
v2:
- Remove unnecessary parentheses in kmalloc_array() call as suggested by Andy Shevchenko.

 drivers/staging/media/atomisp/pci/sh_css_firmware.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/pci/sh_css_firmware.c +3 -3
index 57ecf5549c23..af12df2f9b09 100644
@@ -253,9 +253,9 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,
 	sh_css_num_binaries = file_header->binary_nr;
 	/* Only allocate memory for ISP blob info */
 	if (sh_css_num_binaries > NUM_OF_SPS) {
-		sh_css_blob_info = kmalloc(
-		    (sh_css_num_binaries - NUM_OF_SPS) *
-		    sizeof(*sh_css_blob_info), GFP_KERNEL);
+		sh_css_blob_info =
+			kmalloc_array(sh_css_num_binaries - NUM_OF_SPS,
+				      sizeof(*sh_css_blob_info), GFP_KERNEL);
 		if (!sh_css_blob_info)
 			return -ENOMEM;
 	} else {
Signature · 1 line
2.34.1
#1 lore raw
Quoted 7 lines · Lin YuChen

Replace the open-coded multiplication in kmalloc() with kmalloc_array() to provide overflow protection and improve code readability.

---
v2:
- Remove unnecessary parentheses in kmalloc_array() call as suggested by Andy Shevchenko.

This marked as v1 and 2/2, where is the patch 1, and what is v2 here?

Signature · 2 lines
With Best Regards,
Andy Shevchenko
author
#2 lore raw
Quoted 10 lines · Andy Shevchenko
Quoted 7 lines · Lin YuChen

Replace the open-coded multiplication in kmalloc() with kmalloc_array() to provide overflow protection and improve code readability.

---
v2:
- Remove unnecessary parentheses in kmalloc_array() call as suggested by Andy Shevchenko.

Quoted 7 lines

This marked as v1 and 2/2, where is the patch 1, and what is v2 here?

--
With Best Regards,
Andy Shevchenko

Hi Andy,

Sorry for the confusion. I made a mistake in the versioning and numbering while using git format-patch. This was intended to be v2 of the single patch, but I incorrectly sent it as v1 2/2.

I will send a clean v3 shortly with the correct headers and changelog to clear this up.

Thanks, Lin YuChen

author
#3 lore raw

PATCH v3 1/1 staging: media: atomisp: use kmalloc_array() for sh_css_blob_info

In reply to Andy Shevchenko

Replace the open-coded multiplication in kmalloc() with kmalloc_array() to provide overflow protection and improve code readability.

---
v3:
- Resend as a single patch to fix the incorrect versioning and numbering (1/2, 2/2) in the previous submission.
v2:
- Remove unnecessary parentheses in kmalloc_array() call as suggested by Andy Shevchenko.

 drivers/staging/media/atomisp/pci/sh_css_firmware.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/staging/media/atomisp/pci/sh_css_firmware.c +3 -3
index 57ecf5549c23..af12df2f9b09 100644
@@ -253,9 +253,9 @@ sh_css_load_firmware(struct device *dev, const char *fw_data,
 	sh_css_num_binaries = file_header->binary_nr;
 	/* Only allocate memory for ISP blob info */
 	if (sh_css_num_binaries > NUM_OF_SPS) {
-		sh_css_blob_info = kmalloc(
-		    (sh_css_num_binaries - NUM_OF_SPS) *
-		    sizeof(*sh_css_blob_info), GFP_KERNEL);
+		sh_css_blob_info =
+			kmalloc_array(sh_css_num_binaries - NUM_OF_SPS,
+				      sizeof(*sh_css_blob_info), GFP_KERNEL);
 		if (!sh_css_blob_info)
 			return -ENOMEM;
 	} else {
Signature · 1 line
2.34.1