From: Dan Carpenter <dan.carpenter@oracle.com>
Date: Wed, 24 Jun 2015 14:30:15 +0000 (+0300)
Subject: ACPI / resources: free memory on error in add_region_before()
X-Git-Tag: v4.1.4~64
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2dfdaa269d01df3861f6967fd3d08d1ad732794b;p=users%2Fjedix%2Flinux-maple.git

ACPI / resources: free memory on error in add_region_before()

commit 7bc10388ccdd79b3d20463151a1f8e7a590a775b upstream.

There is a small memory leak on error.

Fixes: 0f1b414d1907 (ACPI / PNP: Avoid conflicting resource reservations)
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index fcb7807ea8b73..10561ce16ed13 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -660,8 +660,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;