Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752351AbdFGXCn (ORCPT ); Wed, 7 Jun 2017 19:02:43 -0400 Received: from wtarreau.pck.nerim.net ([62.212.114.60]:50209 "EHLO 1wt.eu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282AbdFGXCg (ORCPT ); Wed, 7 Jun 2017 19:02:36 -0400 From: Willy Tarreau To: linux-kernel@vger.kernel.org, stable@vger.kernel.org, linux@roeck-us.net Cc: Dan Carpenter , "Rafael J . Wysocki" , Willy Tarreau Subject: [PATCH 3.10 195/250] ACPI / resources: free memory on error in add_region_before() Date: Thu, 8 Jun 2017 00:59:41 +0200 Message-Id: <1496876436-32402-196-git-send-email-w@1wt.eu> X-Mailer: git-send-email 2.8.0.rc2.1.gbe9624a In-Reply-To: <1496876436-32402-1-git-send-email-w@1wt.eu> References: <1496876436-32402-1-git-send-email-w@1wt.eu> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 914 Lines: 32 From: Dan Carpenter commit 7bc10388ccdd79b3d20463151a1f8e7a590a775b upstream. There is a small memory leak on error. Fixes: 0f1b414d1907 (ACPI / PNP: Avoid conflicting resource reservations) Signed-off-by: Dan Carpenter Signed-off-by: Rafael J. Wysocki Signed-off-by: Willy Tarreau --- drivers/acpi/resource.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 226aadb..2a7711f 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -579,8 +579,10 @@ static int add_region_before(u64 start, u64 end, u8 space_id, return -ENOMEM; error = request_range(start, end, space_id, flags, desc); - if (error) + if (error) { + kfree(reg); return error; + } reg->start = start; reg->end = end; -- 2.8.0.rc2.1.gbe9624a