From: Jeff Raubitschek <jhr@google.com>
Date: Tue, 4 Oct 2005 14:21:19 +0000 (-0400)
Subject: [libata passthru] fix leak on error
X-Git-Tag: v2.6.15-rc1~732^2~12
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54dac83c426a1a03bd139c5ac7e938890bd2693e;p=linux-2.6

[libata passthru] fix leak on error
---

diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c
index 98057563a3..75cb685e32 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,