From: Dan Carpenter <[email protected]> 3.12-stable review patch. If anyone has any objections, please let me know.
=============== commit 7bc10388ccdd79b3d20463151a1f8e7a590a775b upstream. There is a small memory leak on error. Fixes: 0f1b414d1907 (ACPI / PNP: Avoid conflicting resource reservations) Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Jiri Slaby <[email protected]> --- 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 28314ba82320..3760e9635aea 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -577,8 +577,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.12.2
