hpsa: fix memory leak in hpsa_big_passthru_ioctl
Subsystems (2)
PATCH 1/1 hpsa: fix memory leak in hpsa_big_passthru_ioctl
From: Stephen M. Cameron <[email protected]>
In the event of a dma mapping error, we forgot to free the command we had allocated.
Signed-off-by Stephen M. Cameron <[email protected]>
--- drivers/scsi/hpsa.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)
drivers/scsi/hpsa.c +5 -6
@@ -3149,7 +3149,7 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)hpsa_pci_unmap (h->pdev, c, i,PCI_DMA_BIDIRECTIONAL ); status = -ENOMEM ; - goto cleanup1; + goto cleanup0; } c->SG[i].Addr.lower = temp64.val32.lower; c->SG[i].Addr.upper = temp64.val32.upper;
@@ -3165,24 +3165,23 @@ static int hpsa_big_passthru_ioctl(struct ctlr_info *h, void __user *argp)/* Copy the error information out */ memcpy (&ioc->error_info, c->err_info,sizeof (ioc->error_info));if (copy_to_user (argp, ioc,sizeof (*ioc))) { -cmd_special_free (h, c); status = -EFAULT ; - goto cleanup1; + goto cleanup0; }if (ioc->Request.Type.Direction ==XFER_READ && ioc->buf_size >0 ) {/* Copy the data out of the buffer we created */ BYTE __user *ptr = ioc->buf;for (i =0 ; i < sg_used; i++) {if (copy_to_user (ptr, buff[i], buff_size[i])) { -cmd_special_free (h, c); status = -EFAULT ; - goto cleanup1; + goto cleanup0; } ptr += buff_size[i]; } } -cmd_special_free (h, c); status =0 ; +cleanup0: +cmd_special_free (h, c); cleanup1:if (buff) {for (i =0 ; i < sg_used; i++)