summaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorJeff Raubitschek <jhr@google.com>2005-10-04 10:21:19 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-10-04 10:21:19 -0400
commit54dac83c426a1a03bd139c5ac7e938890bd2693e (patch)
treee2bc11da1f3cdb99bbe13d5452928b8470604314 /drivers/scsi
parent2ee73cc2d507df7b28050fba5d08bd33dd34848c (diff)
downloadop-kernel-dev-54dac83c426a1a03bd139c5ac7e938890bd2693e.zip
op-kernel-dev-54dac83c426a1a03bd139c5ac7e938890bd2693e.tar.gz
[libata passthru] fix leak on error
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/libata-scsi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 9805756..75cb685 100644
--- a/drivers/scsi/libata-scsi.c
+++ b/drivers/scsi/libata-scsi.c
@@ -116,8 +116,10 @@ int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg)
if (args[3]) {
argsize = SECTOR_SIZE * args[3];
argbuf = kmalloc(argsize, GFP_KERNEL);
- if (argbuf == NULL)
- return -ENOMEM;
+ if (argbuf == NULL) {
+ rc = -ENOMEM;
+ goto error;
+ }
scsi_cmd[1] = (4 << 1); /* PIO Data-in */
scsi_cmd[2] = 0x0e; /* no off.line or cc, read from dev,
OpenPOWER on IntegriCloud