From: Tomas Henzl <thenzl@redhat.com>
Date: Fri, 23 Jan 2015 22:41:14 +0000 (-0600)
Subject: hpsa: fix memory leak in kdump hard reset
X-Git-Tag: v3.16.35~2340
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3b18b6825a965653c87487474412eb05e2fa733c;p=thirdparty%2Fkernel%2Fstable.git

hpsa: fix memory leak in kdump hard reset

commit 03741d956eaac31264952e0afa181b62713892a5 upstream.

There is a potential memory leak in hpsa_kdump_hard_reset_controller.

Reviewed-by: Don Brace <don.brace@pmcs.com>
Reviewed-by: Scott Teel <scott.teel@pmcs.com>
Signed-off-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Don Brace <don.brace@pmcs.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Cc: Masoud Sharbiani <msharbiani@twopensource.com>
Cc: Vinson Lee <vlee@twopensource.com>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
---

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 28533dbd3407a..35996a8290469 100644
--- a/drivers/scsi/hpsa.c
+++ b/drivers/scsi/hpsa.c
@@ -5995,7 +5995,7 @@ static int hpsa_kdump_hard_reset_controller(struct pci_dev *pdev)
 	}
 	rc = write_driver_ver_to_cfgtable(cfgtable);
 	if (rc)
-		goto unmap_vaddr;
+		goto unmap_cfgtable;
 
 	/* If reset via doorbell register is supported, use that.
 	 * There are two such methods.  Favor the newest method.