lkml.org 
[lkml]   [2015]   [Jun]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH] ACPI / resources: fix memory leak on request_range fail path
Date
From: Colin Ian King <colin.king@canonical.com>

static analysis from cppcheck detected a memory leak:
[drivers/acpi/resource.c:664]: (error) Memory leak: reg

the error path on a failed request_range call should free
reg before returning. Bug introduced in the recent commit
0f1b414d190724617eb1cdd615592fa8cd9d0b50
("ACPI / PNP: Avoid conflicting resource reservations")

Fixes: 0f1b414d19 ("ACPI / PNP: Avoid conflicting resource reservations")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
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 fcb7807..10561ce 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;
--
2.1.4


\
 
 \ /
  Last update: 2015-06-29 22:41    [W:0.032 / U:1.696 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site