lkml.org 
[lkml]   [2020]   [Apr]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 13/64] of: unittest: kmemleak in of_unittest_overlay_high_level()
    Date
    From: Frank Rowand <frank.rowand@sony.com>

    commit 145fc138f9aae4f9e1331352e301df28e16aed35 upstream.

    kmemleak reports several memory leaks from devicetree unittest.
    This is the fix for problem 3 of 5.

    of_unittest_overlay_high_level() failed to kfree the newly created
    property when the property named 'name' is skipped.

    Fixes: 39a751a4cb7e ("of: change overlay apply input data from unflattened to FDT")
    Reported-by: Erhard F. <erhard_f@mailbox.org>
    Signed-off-by: Frank Rowand <frank.rowand@sony.com>
    Signed-off-by: Rob Herring <robh@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/of/unittest.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    --- a/drivers/of/unittest.c
    +++ b/drivers/of/unittest.c
    @@ -2448,8 +2448,11 @@ static __init void of_unittest_overlay_h
    goto err_unlock;
    }
    if (__of_add_property(of_symbols, new_prop)) {
    + kfree(new_prop->name);
    + kfree(new_prop->value);
    + kfree(new_prop);
    /* "name" auto-generated by unflatten */
    - if (!strcmp(new_prop->name, "name"))
    + if (!strcmp(prop->name, "name"))
    continue;
    unittest(0, "duplicate property '%s' in overlay_base node __symbols__",
    prop->name);

    \
     
     \ /
      Last update: 2020-04-22 12:15    [W:4.438 / U:0.272 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site