[2.4] Memleak in drivers/scsi/cpqfcTSinit.c::cpqfcTS_ioctl()

From: Oleg Drokin (green@linuxhacker.ru)
Date: Thu Mar 13 2003 - 13:49:27 EST


Hello!

   There is a trivial memleak in drivers/scsi/cpqfcTSinit.c::cpqfcTS_ioctl()
   on error exit paths if copy_to/from_user fails, see the patch below.
   Found with help of smatch + enhanced unfree script.

Bye,
    Oleg

===== drivers/scsi/cpqfcTSinit.c 1.14 vs edited =====
--- 1.14/drivers/scsi/cpqfcTSinit.c Tue Dec 17 16:18:20 2002
+++ edited/drivers/scsi/cpqfcTSinit.c Thu Mar 13 21:45:20 2003
@@ -467,8 +467,10 @@
                                 // Need data from user?
                                 // make sure caller's buffer is in kernel space.
                                 if ((vendor_cmd->rw_flag == VENDOR_WRITE_OPCODE) && vendor_cmd->len)
- if (copy_from_user(buf, vendor_cmd->bufp, vendor_cmd->len))
+ if (copy_from_user(buf, vendor_cmd->bufp, vendor_cmd->len)) {
+ kfree(buf);
                                                 return (-EFAULT);
+ }
 
                                 // copy the CDB (if/when MAX_COMMAND_SIZE is 16, remove copy below)
                                 memcpy(&ScsiPassThruCmnd->cmnd[0], &vendor_cmd->cdb[0], MAX_COMMAND_SIZE);
@@ -533,7 +535,7 @@
                                 // need to pass data back to user (space)?
                                 if ((vendor_cmd->rw_flag == VENDOR_READ_OPCODE) && vendor_cmd->len)
                                         if (copy_to_user(vendor_cmd->bufp, buf, vendor_cmd->len))
- return (-EFAULT);
+ result = -EFAULT;
 
                                 if (buf)
                                         kfree(buf);
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Mar 15 2003 - 22:00:36 EST