lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 130/142] ACPI / resources: free memory on error in add_region_before()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    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 <dan.carpenter@oracle.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    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
    \
     
     \ /
      Last update: 2017-04-10 17:37    [W:4.030 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site