sugar/linux
1
0
Fork 0
Code Activity

scsi: smartpqi: Replace kmalloc() + copy_from_user() with memdup_user()

Browse Source 
Replace kmalloc() followed by copy_from_user() with memdup_user() to
simplify and improve pqi_passthru_ioctl().

Since memdup_user() already allocates memory, use kzalloc() in the else
branch instead of manually zeroing 'kernel_buffer' using memset(0).

Return early if an error occurs.  No functional changes intended.

Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
Acked-by: Don Brace <don.brace@microchip.com>
Message-Id: <20250922201832.1697874-2-thorsten.blum@linux.dev>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Thorsten Blum
2025-09-22 22:18:33 +02:00
committed by Martin K. Petersen
parent ac01fc418f
commit 0ac3c901fb
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/scsi/smartpqi/smartpqi_init.c
View File

@@ -20,6 +20,7 @@
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/cciss_ioctl.h> #include <linux/cciss_ioctl.h>
#include <linux/crash_dump.h> #include <linux/crash_dump.h>
#include <linux/string.h>
#include <scsi/scsi_host.h> #include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h> #include <scsi/scsi_cmnd.h>
#include <scsi/scsi_device.h> #include <scsi/scsi_device.h>
@@ -6774,17 +6775,15 @@ static int pqi_passthru_ioctl(struct pqi_ctrl_info *ctrl_info, void __user *arg)
} }
if (iocommand.buf_size > 0) { if (iocommand.buf_size > 0) {
kernel_buffer = kmalloc(iocommand.buf_size, GFP_KERNEL);
if (!kernel_buffer)
return -ENOMEM;
if (iocommand.Request.Type.Direction & XFER_WRITE) { if (iocommand.Request.Type.Direction & XFER_WRITE) {
if (copy_from_user(kernel_buffer, iocommand.buf, kernel_buffer = memdup_user(iocommand.buf,
iocommand.buf_size)) { iocommand.buf_size);
rc = -EFAULT; if (IS_ERR(kernel_buffer))
goto out; return PTR_ERR(kernel_buffer);
}
} else { } else {
memset(kernel_buffer, 0, iocommand.buf_size); kernel_buffer = kzalloc(iocommand.buf_size, GFP_KERNEL);
if (!kernel_buffer)
return -ENOMEM;
} }
} }