Skip to content

L
linux
Commit 138125f7 authored by Al Viro's avatar Al Viro Committed by Martin K. Petersen
Browse files
Options

scsi: hpsa: Lift {BIG_,}IOCTL_Command_struct copy{in,out} into hpsa_ioctl() 

Link: https://lore.kernel.org/r/20200529234028.46373-1-viro@ZenIV.linux.org.ukAcked-by: default avatarDon Brace <don.brace@microsemi.com>
Tested-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 7b6668d8
Show whitespace changes
Inline Side-by-side
Showing with 56 additions and 60 deletions
drivers/scsi/hpsa.c
View file @ 138125f7
...@@ -6358,37 +6358,33 @@ static int hpsa_getdrivver_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6358,37 +6358,33 @@ static int hpsa_getdrivver_ioctl(struct ctlr_info *h, void __user *argp)
return 0; return 0;
} }
static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) static int hpsa_passthru_ioctl(struct ctlr_info *h,
IOCTL_Command_struct *iocommand)
{ {
IOCTL_Command_struct iocommand;
struct CommandList *c; struct CommandList *c;
char *buff = NULL; char *buff = NULL;
u64 temp64; u64 temp64;
int rc = 0; int rc = 0;
if (!argp)
return -EINVAL;
if (!capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_RAWIO))
return -EPERM; return -EPERM;
if (copy_from_user(&iocommand, argp, sizeof(iocommand))) if ((iocommand->buf_size < 1) &&
return -EFAULT; (iocommand->Request.Type.Direction != XFER_NONE)) {
if ((iocommand.buf_size < 1) &&
(iocommand.Request.Type.Direction != XFER_NONE)) {
return -EINVAL; return -EINVAL;
} }
if (iocommand.buf_size > 0) { if (iocommand->buf_size > 0) {
buff = kmalloc(iocommand.buf_size, GFP_KERNEL); buff = kmalloc(iocommand->buf_size, GFP_KERNEL);
if (buff == NULL) if (buff == NULL)
return -ENOMEM; return -ENOMEM;
if (iocommand.Request.Type.Direction & XFER_WRITE) { if (iocommand->Request.Type.Direction & XFER_WRITE) {
/* Copy the data into the buffer we created */ /* Copy the data into the buffer we created */
if (copy_from_user(buff, iocommand.buf, if (copy_from_user(buff, iocommand->buf,
iocommand.buf_size)) { iocommand->buf_size)) {
rc = -EFAULT; rc = -EFAULT;
goto out_kfree; goto out_kfree;
} }
} else { } else {
memset(buff, 0, iocommand.buf_size); memset(buff, 0, iocommand->buf_size);
} }
} }
c = cmd_alloc(h); c = cmd_alloc(h);
...@@ -6398,23 +6394,23 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6398,23 +6394,23 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
c->scsi_cmd = SCSI_CMD_BUSY; c->scsi_cmd = SCSI_CMD_BUSY;
/* Fill in Command Header */ /* Fill in Command Header */
c->Header.ReplyQueue = 0; /* unused in simple mode */ c->Header.ReplyQueue = 0; /* unused in simple mode */
if (iocommand.buf_size > 0) { /* buffer to fill */ if (iocommand->buf_size > 0) { /* buffer to fill */
c->Header.SGList = 1; c->Header.SGList = 1;
c->Header.SGTotal = cpu_to_le16(1); c->Header.SGTotal = cpu_to_le16(1);
} else { /* no buffers to fill */ } else { /* no buffers to fill */
c->Header.SGList = 0; c->Header.SGList = 0;
c->Header.SGTotal = cpu_to_le16(0); c->Header.SGTotal = cpu_to_le16(0);
} }
memcpy(&c->Header.LUN, &iocommand.LUN_info, sizeof(c->Header.LUN)); memcpy(&c->Header.LUN, &iocommand->LUN_info, sizeof(c->Header.LUN));
/* Fill in Request block */ /* Fill in Request block */
memcpy(&c->Request, &iocommand.Request, memcpy(&c->Request, &iocommand->Request,
sizeof(c->Request)); sizeof(c->Request));
/* Fill in the scatter gather information */ /* Fill in the scatter gather information */
if (iocommand.buf_size > 0) { if (iocommand->buf_size > 0) {
temp64 = dma_map_single(&h->pdev->dev, buff, temp64 = dma_map_single(&h->pdev->dev, buff,
iocommand.buf_size, DMA_BIDIRECTIONAL); iocommand->buf_size, DMA_BIDIRECTIONAL);
if (dma_mapping_error(&h->pdev->dev, (dma_addr_t) temp64)) { if (dma_mapping_error(&h->pdev->dev, (dma_addr_t) temp64)) {
c->SG[0].Addr = cpu_to_le64(0); c->SG[0].Addr = cpu_to_le64(0);
c->SG[0].Len = cpu_to_le32(0); c->SG[0].Len = cpu_to_le32(0);
...@@ -6422,12 +6418,12 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6422,12 +6418,12 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
goto out; goto out;
} }
c->SG[0].Addr = cpu_to_le64(temp64); c->SG[0].Addr = cpu_to_le64(temp64);
c->SG[0].Len = cpu_to_le32(iocommand.buf_size); c->SG[0].Len = cpu_to_le32(iocommand->buf_size);
c->SG[0].Ext = cpu_to_le32(HPSA_SG_LAST); /* not chaining */ c->SG[0].Ext = cpu_to_le32(HPSA_SG_LAST); /* not chaining */
} }
rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE, rc = hpsa_scsi_do_simple_cmd(h, c, DEFAULT_REPLY_QUEUE,
NO_TIMEOUT); NO_TIMEOUT);
if (iocommand.buf_size > 0) if (iocommand->buf_size > 0)
hpsa_pci_unmap(h->pdev, c, 1, DMA_BIDIRECTIONAL); hpsa_pci_unmap(h->pdev, c, 1, DMA_BIDIRECTIONAL);
check_ioctl_unit_attention(h, c); check_ioctl_unit_attention(h, c);
if (rc) { if (rc) {
...@@ -6436,16 +6432,12 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6436,16 +6432,12 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
} }
/* Copy the error information out */ /* Copy the error information out */
memcpy(&iocommand.error_info, c->err_info, memcpy(&iocommand->error_info, c->err_info,
sizeof(iocommand.error_info)); sizeof(iocommand->error_info));
if (copy_to_user(argp, &iocommand, sizeof(iocommand))) { if ((iocommand->Request.Type.Direction & XFER_READ) &&
rc = -EFAULT; iocommand->buf_size > 0) {
goto out;
}
if ((iocommand.Request.Type.Direction & XFER_READ) &&
iocommand.buf_size > 0) {
/* Copy the data out of the buffer we created */ /* Copy the data out of the buffer we created */
if (copy_to_user(iocommand.buf, buff, iocommand.buf_size)) { if (copy_to_user(iocommand->buf, buff, iocommand->buf_size)) {
rc = -EFAULT; rc = -EFAULT;
goto out; goto out;
} }
...@@ -6457,9 +6449,9 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6457,9 +6449,9 @@ static int hpsa_passthru_ioctl(struct ctlr_info *h, void __user *argp)
return rc; return rc;
} }
static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) static int hpsa_big_passthru_ioctl(struct ctlr_info *h,
BIG_IOCTL_Command_struct *ioc)
{ {
BIG_IOCTL_Command_struct *ioc;
struct CommandList *c; struct CommandList *c;
unsigned char **buff = NULL; unsigned char **buff = NULL;
int *buff_size = NULL; int *buff_size = NULL;
...@@ -6470,29 +6462,17 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6470,29 +6462,17 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
u32 sz; u32 sz;
BYTE __user *data_ptr; BYTE __user *data_ptr;
if (!argp)
return -EINVAL;
if (!capable(CAP_SYS_RAWIO)) if (!capable(CAP_SYS_RAWIO))
return -EPERM; return -EPERM;
ioc = vmemdup_user(argp, sizeof(*ioc));
if (IS_ERR(ioc)) {
status = PTR_ERR(ioc);
goto cleanup1;
}
if ((ioc->buf_size < 1) && if ((ioc->buf_size < 1) &&
(ioc->Request.Type.Direction != XFER_NONE)) { (ioc->Request.Type.Direction != XFER_NONE))
status = -EINVAL; return -EINVAL;
goto cleanup1;
}
/* Check kmalloc limits using all SGs */ /* Check kmalloc limits using all SGs */
if (ioc->malloc_size > MAX_KMALLOC_SIZE) { if (ioc->malloc_size > MAX_KMALLOC_SIZE)
status = -EINVAL; return -EINVAL;
goto cleanup1; if (ioc->buf_size > ioc->malloc_size * SG_ENTRIES_IN_CMD)
} return -EINVAL;
if (ioc->buf_size > ioc->malloc_size * SG_ENTRIES_IN_CMD) {
status = -EINVAL;
goto cleanup1;
}
buff = kcalloc(SG_ENTRIES_IN_CMD, sizeof(char *), GFP_KERNEL); buff = kcalloc(SG_ENTRIES_IN_CMD, sizeof(char *), GFP_KERNEL);
if (!buff) { if (!buff) {
status = -ENOMEM; status = -ENOMEM;
...@@ -6565,10 +6545,6 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6565,10 +6545,6 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
/* Copy the error information out */ /* Copy the error information out */
memcpy(&ioc->error_info, c->err_info, sizeof(ioc->error_info)); memcpy(&ioc->error_info, c->err_info, sizeof(ioc->error_info));
if (copy_to_user(argp, ioc, sizeof(*ioc))) {
status = -EFAULT;
goto cleanup0;
}
if ((ioc->Request.Type.Direction & XFER_READ) && ioc->buf_size > 0) { if ((ioc->Request.Type.Direction & XFER_READ) && ioc->buf_size > 0) {
int i; int i;
...@@ -6594,7 +6570,6 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp) ...@@ -6594,7 +6570,6 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)
kfree(buff); kfree(buff);
} }
kfree(buff_size); kfree(buff_size);
kvfree(ioc);
return status; return status;
} }
...@@ -6628,18 +6603,39 @@ static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd, ...@@ -6628,18 +6603,39 @@ static int hpsa_ioctl(struct scsi_device *dev, unsigned int cmd,
return hpsa_getpciinfo_ioctl(h, argp); return hpsa_getpciinfo_ioctl(h, argp);
case CCISS_GETDRIVVER: case CCISS_GETDRIVVER:
return hpsa_getdrivver_ioctl(h, argp); return hpsa_getdrivver_ioctl(h, argp);
case CCISS_PASSTHRU: case CCISS_PASSTHRU: {
IOCTL_Command_struct iocommand;
if (!argp)
return -EINVAL;
if (copy_from_user(&iocommand, argp, sizeof(iocommand)))
return -EFAULT;
if (atomic_dec_if_positive(&h->passthru_cmds_avail) < 0) if (atomic_dec_if_positive(&h->passthru_cmds_avail) < 0)
return -EAGAIN; return -EAGAIN;
rc = hpsa_passthru_ioctl(h, argp); rc = hpsa_passthru_ioctl(h, &iocommand);
atomic_inc(&h->passthru_cmds_avail); atomic_inc(&h->passthru_cmds_avail);
if (!rc && copy_to_user(argp, &iocommand, sizeof(iocommand)))
rc = -EFAULT;
return rc; return rc;
case CCISS_BIG_PASSTHRU: }
case CCISS_BIG_PASSTHRU: {
BIG_IOCTL_Command_struct *ioc;
if (!argp)
return -EINVAL;
if (atomic_dec_if_positive(&h->passthru_cmds_avail) < 0) if (atomic_dec_if_positive(&h->passthru_cmds_avail) < 0)
return -EAGAIN; return -EAGAIN;
rc = hpsa_big_passthru_ioctl(h, argp); ioc = vmemdup_user(argp, sizeof(*ioc));
if (IS_ERR(ioc)) {
atomic_inc(&h->passthru_cmds_avail); atomic_inc(&h->passthru_cmds_avail);
return PTR_ERR(ioc);
}
rc = hpsa_big_passthru_ioctl(h, ioc);
atomic_inc(&h->passthru_cmds_avail);
if (!rc && copy_to_user(argp, ioc, sizeof(*ioc)))
rc = -EFAULT;
kvfree(ioc);
return rc; return rc;
}
default: default:
return -ENOTTY; return -ENOTTY;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7