diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 17:30:15 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-03 09:29:14 -0700 |
commit | 2dfdaa269d01df3861f6967fd3d08d1ad732794b (patch) | |
tree | f2de952d4c0059eff020879070628633d455dd59 | |
parent | 94fc30841d7d5f59957db6231100c5c07e7c0eab (diff) | |
download | lwn-2dfdaa269d01df3861f6967fd3d08d1ad732794b.tar.gz lwn-2dfdaa269d01df3861f6967fd3d08d1ad732794b.zip |
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>
-rw-r--r-- | drivers/acpi/resource.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index fcb7807ea8b7..10561ce16ed1 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; |