[3.16.y-ckt stable] Patch "hpsa: fix memory leak in kdump hard reset" has been added to staging queue

[Luis Henriques]

This is a note to let you know that I have just added a patch titled

    hpsa: fix memory leak in kdump hard reset

to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree 
which can be found at:

 http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.16.y-queue

This patch is scheduled to be released in version 3.16.7-ckt10.

If you, or anyone else, feels it should not be added to this tree, please 
reply to this email.

For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable

Thanks.
-Luis

------

>From 3b18b6825a965653c87487474412eb05e2fa733c Mon Sep 17 00:00:00 2001
From: Tomas Henzl <thenzl at redhat.com>
Date: Fri, 23 Jan 2015 16:41:14 -0600
Subject: 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 at pmcs.com>
Reviewed-by: Scott Teel <scott.teel at pmcs.com>
Signed-off-by: Tomas Henzl <thenzl at redhat.com>
Signed-off-by: Don Brace <don.brace at pmcs.com>
Signed-off-by: Christoph Hellwig <hch at lst.de>
Cc: Masoud Sharbiani <msharbiani at twopensource.com>
Cc: Vinson Lee <vlee at twopensource.com>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
 drivers/scsi/hpsa.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c
index 28533dbd3407..35996a829046 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.