lkml.org 
[lkml]   [2018]   [Jan]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 04/63] mfd: twl4030-audio: Fix sibling-node lookup
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit 0a423772de2f3d7b00899987884f62f63ae00dcb upstream.

    A helper purported to look up a child node based on its name was using
    the wrong of-helper and ended up prematurely freeing the parent of-node
    while leaking any matching node.

    To make things worse, any matching node would not even necessarily be a
    child node as the whole device tree was searched depth-first starting at
    the parent.

    Fixes: 019a7e6b7b31 ("mfd: twl4030-audio: Add DT support")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
    Signed-off-by: Lee Jones <lee.jones@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/mfd/twl4030-audio.c | 9 +++++++--
    1 file changed, 7 insertions(+), 2 deletions(-)

    --- a/drivers/mfd/twl4030-audio.c
    +++ b/drivers/mfd/twl4030-audio.c
    @@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void
    EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk);

    static bool twl4030_audio_has_codec(struct twl4030_audio_data *pdata,
    - struct device_node *node)
    + struct device_node *parent)
    {
    + struct device_node *node;
    +
    if (pdata && pdata->codec)
    return true;

    - if (of_find_node_by_name(node, "codec"))
    + node = of_get_child_by_name(parent, "codec");
    + if (node) {
    + of_node_put(node);
    return true;
    + }

    return false;
    }

    \
     
     \ /
      Last update: 2018-01-01 15:27    [W:2.249 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site