Skip to content

Commit

Permalink
mtip32xx: don't open-code memdup_user()
Browse files Browse the repository at this point in the history
[folded a fix by Dan Carpenter]

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Jan 6, 2016
1 parent 793b796 commit 8ed6010
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions drivers/block/mtip32xx/mtip32xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -2029,13 +2029,10 @@ static int exec_drive_taskfile(struct driver_data *dd,
}

if (taskout) {
outbuf = kzalloc(taskout, GFP_KERNEL);
if (outbuf == NULL) {
err = -ENOMEM;
goto abort;
}
if (copy_from_user(outbuf, buf + outtotal, taskout)) {
err = -EFAULT;
outbuf = memdup_user(buf + outtotal, taskout);
if (IS_ERR(outbuf)) {
err = PTR_ERR(outbuf);
outbuf = NULL;
goto abort;
}
outbuf_dma = pci_map_single(dd->pdev,
Expand All @@ -2050,14 +2047,10 @@ static int exec_drive_taskfile(struct driver_data *dd,
}

if (taskin) {
inbuf = kzalloc(taskin, GFP_KERNEL);
if (inbuf == NULL) {
err = -ENOMEM;
goto abort;
}

if (copy_from_user(inbuf, buf + intotal, taskin)) {
err = -EFAULT;
inbuf = memdup_user(buf + intotal, taskin);
if (IS_ERR(inbuf)) {
err = PTR_ERR(inbuf);
inbuf = NULL;
goto abort;
}
inbuf_dma = pci_map_single(dd->pdev,
Expand Down

0 comments on commit 8ed6010

Please sign in to comment.