diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-06-24 17:30:15 +0300 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2015-07-15 10:00:51 +0100 |
| commit | 8d6015e0ede2d98d1f9b18877cae15fdddd7abb8 (patch) | |
| tree | c4ce2389ddca76d397a76d6eb7a4b248baf797aa /drivers/acpi | |
| parent | 86a88cf35327fb7896daa2f9a7da591f41b23b43 (diff) | |
| download | linux-stable-8d6015e0ede2d98d1f9b18877cae15fdddd7abb8.tar.gz linux-stable-8d6015e0ede2d98d1f9b18877cae15fdddd7abb8.tar.bz2 linux-stable-8d6015e0ede2d98d1f9b18877cae15fdddd7abb8.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: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'drivers/acpi')
| -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 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; |