summaryrefslogtreecommitdiff
path: root/drivers/scsi
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2020-05-30 00:40:26 +0100
committerMartin K. Petersen <martin.petersen@oracle.com>2020-06-04 10:15:31 -0400
commitcb17c1b69b175e3f7ae2ef53e384889cdbae5c0d (patch)
tree887a3a4c4bd7d667abd6ff5a193bf305fd5d9396 /drivers/scsi
parent138125f74b254fd2e37b3d875faf8e0e8608299b (diff)
scsi: hpsa: Don't bother with vmalloc for BIG_IOCTL_Command_struct
"BIG" in the name refers to the amount of data being transferred, _not_ the size of structure itself; it's 140 or 144 bytes (for 32bit and 64bit hosts resp.). IOCTL_Command_struct is 136 or 144 bytes large... No point whatsoever turning that into dynamic allocation, let alone vmalloc one. Just keep it as local variable... Link: https://lore.kernel.org/r/20200529234028.46373-2-viro@ZenIV.linux.org.uk Acked-by: Don Brace <don.brace@microsemi.com> Tested-by: Don Brace <don.brace@microsemi.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/hpsa.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 3344a06c938e..64fd97272109 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -6619,21 +6619,17 @@ static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd,
return rc;
}
case CCISS_BIG_PASSTHRU: {
- BIG_IOCTL_Command_struct *ioc;
+ BIG_IOCTL_Command_struct ioc;
if (!argp)
return -EINVAL;
+ if (copy_from_user(&ioc, argp, sizeof(ioc)))
+ return -EFAULT;
if (atomic_dec_if_positive(&h->passthru_cmds_avail) < 0)
return -EAGAIN;
- ioc = vmemdup_user(argp, sizeof(*ioc));
- if (IS_ERR(ioc)) {
- atomic_inc(&h->passthru_cmds_avail);
- return PTR_ERR(ioc);
- }
- rc = hpsa_big_passthru_ioctl(h, ioc);
+ rc = hpsa_big_passthru_ioctl(h, &ioc);
atomic_inc(&h->passthru_cmds_avail);
- if (!rc && copy_to_user(argp, ioc, sizeof(*ioc)))
+ if (!rc && copy_to_user(argp, &ioc, sizeof(ioc)))
rc = -EFAULT;
- kvfree(ioc);
return rc;
}
default: