Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932802AbbDUPfp (ORCPT ); Tue, 21 Apr 2015 11:35:45 -0400 Received: from youngberry.canonical.com ([91.189.89.112]:57862 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932755AbbDUPfg (ORCPT ); Tue, 21 Apr 2015 11:35:36 -0400 From: Luis Henriques To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, kernel-team@lists.ubuntu.com Cc: Tomas Henzl , Don Brace , Christoph Hellwig , Masoud Sharbiani , Vinson Lee , Luis Henriques Subject: [PATCH 3.16.y-ckt 139/144] hpsa: fix memory leak in kdump hard reset Date: Tue, 21 Apr 2015 16:32:04 +0100 Message-Id: <1429630329-21748-140-git-send-email-luis.henriques@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1429630329-21748-1-git-send-email-luis.henriques@canonical.com> References: <1429630329-21748-1-git-send-email-luis.henriques@canonical.com> X-Extended-Stable: 3.16 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1443 Lines: 40 3.16.7-ckt10 -stable review patch. If anyone has any objections, please let me know. ------------------ From: Tomas Henzl commit 03741d956eaac31264952e0afa181b62713892a5 upstream. There is a potential memory leak in hpsa_kdump_hard_reset_controller. Reviewed-by: Don Brace Reviewed-by: Scott Teel Signed-off-by: Tomas Henzl Signed-off-by: Don Brace Signed-off-by: Christoph Hellwig Cc: Masoud Sharbiani Cc: Vinson Lee Signed-off-by: Luis Henriques --- 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. -- 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/