From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755386AbdKMUPW (ORCPT ); Mon, 13 Nov 2017 15:15:22 -0500 Received: from fllnx210.ext.ti.com ([198.47.19.17]:65432 "EHLO fllnx210.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755094AbdKMUPS (ORCPT ); Mon, 13 Nov 2017 15:15:18 -0500 Subject: Re: [PATCH 1/2] mfd: twl4030-audio: fix sibling-node lookup To: Johan Hovold , Tony Lindgren CC: Lee Jones , , , stable References: <20171111153844.16741-1-johan@kernel.org> From: Peter Ujfalusi Message-ID: <189caf41-7298-ab1e-6a67-f6ff86fea47f@ti.com> Date: Mon, 13 Nov 2017 22:13:42 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <20171111153844.16741-1-johan@kernel.org> Content-Type: text/plain; charset="utf-8" Content-Language: en-GB Content-Transfer-Encoding: 8bit X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/11/2017 05:38 PM, Johan Hovold wrote: > 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. I think it is the same case as with the twl6040, there were no of_get_child_by_name() when this was done... Thanks for fixing it! Acked-by: Peter Ujfalusi > > Fixes: 019a7e6b7b31 ("mfd: twl4030-audio: Add DT support") > Cc: stable # 3.7 > Cc: Peter Ujfalusi > --- > drivers/mfd/twl4030-audio.c | 9 +++++++-- > 1 file changed, 7 insertions(+), 2 deletions(-) > > diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c > index da16bf45fab4..dc94ffc6321a 100644 > --- 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; > } > -- Péter Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki