From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AD19C43441 for ; Mon, 26 Nov 2018 15:14:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 03C4220663 for ; Mon, 26 Nov 2018 15:14:26 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="l/F3c4Ei" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03C4220663 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726630AbeK0CIs (ORCPT ); Mon, 26 Nov 2018 21:08:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:32982 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726253AbeK0CIr (ORCPT ); Mon, 26 Nov 2018 21:08:47 -0500 Received: from localhost (unknown [178.228.8.233]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6209820663; Mon, 26 Nov 2018 15:14:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543245262; bh=iACnV1Pmbmy7wdtBkYqYLC7v60g59485OgrJhX7eRcQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=l/F3c4Ei2bbzeY9/FBwkIBgoNlmLuDbfnJbfaP82xu9WUfLXMkS7ao0mVzZBZ1CDd 6xahhGGJNacG+vfCI0sCAp9hDBn475aLS7Z3fr/kp6waOxBfGDngEARlfF1ucc+VSX CIkwCdApx8Koc7/97xBl8xCeasR3U1S1DgfvxgW8= Date: Mon, 26 Nov 2018 16:14:18 +0100 From: Greg Kroah-Hartman To: Boris Brezillon Cc: Naresh Kamboju , open list , linux- stable , nicolas.ferre@microchip.com, rainyfeeling@outlook.com, johan@kernel.org Subject: Re: [PATCH 4.14 58/62] mtd: rawnand: atmel: fix OF child-node lookup Message-ID: <20181126151418.GA19698@kroah.com> References: <20181126105050.592727680@linuxfoundation.org> <20181126105054.941598787@linuxfoundation.org> <20181126160840.1c702e87@bbrezillon> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181126160840.1c702e87@bbrezillon> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Nov 26, 2018 at 04:08:40PM +0100, Boris Brezillon wrote: > On Mon, 26 Nov 2018 19:46:15 +0530 > Naresh Kamboju wrote: > > > Do you see build failure arm x15 beagleboard on 4.14 due to this patch ? > > > > On Mon, 26 Nov 2018 at 16:31, Greg Kroah-Hartman > > wrote: > > > > > > 4.14-stable review patch. If anyone has any objections, please let me know. > > > > > > ------------------ > > > > > > From: Johan Hovold > > > > > > commit 5d1e9c2212ea6b4dd735e4fc3dd6279a365d5d10 upstream. > > > > > > Use the new of_get_compatible_child() helper to lookup the nfc child > > > node instead of using of_find_compatible_node(), which searches the > > > entire tree from a given start node and thus can return an unrelated > > > (i.e. non-child) node. > > > > > > This also addresses a potential use-after-free (e.g. after probe > > > deferral) as the tree-wide helper drops a reference to its first > > > argument (i.e. the node of the device being probed). > > > > > > While at it, also fix a related nfc-node reference leak. > > > > > > Fixes: f88fc122cc34 ("mtd: nand: Cleanup/rework the atmel_nand driver") > > > Cc: stable # 4.11 > > > Cc: Nicolas Ferre > > > Cc: Josh Wu > > > Cc: Boris Brezillon > > > Signed-off-by: Johan Hovold > > > Signed-off-by: Boris Brezillon > > > Signed-off-by: Greg Kroah-Hartman > > > > > > --- > > > drivers/mtd/nand/atmel/nand-controller.c | 11 +++++++---- > > > 1 file changed, 7 insertions(+), 4 deletions(-) > > > > > > --- a/drivers/mtd/nand/atmel/nand-controller.c > > > +++ b/drivers/mtd/nand/atmel/nand-controller.c > > > @@ -2077,8 +2077,7 @@ atmel_hsmc_nand_controller_legacy_init(s > > > int ret; > > > > > > nand_np = dev->of_node; > > > - nfc_np = of_find_compatible_node(dev->of_node, NULL, > > > - "atmel,sama5d3-nfc"); > > > + nfc_np = of_get_compatible_child(dev->of_node, "atmel,sama5d3-nfc"); > > > if (!nfc_np) { > > > dev_err(dev, "Could not find device node for sama5d3-nfc\n"); > > > return -ENODEV; > > > @@ -2492,15 +2491,19 @@ static int atmel_nand_controller_probe(s > > > } > > > > > > if (caps->legacy_of_bindings) { > > > + struct device_node *nfc_node; > > > u32 ale_offs = 21; > > > > > > /* > > > * If we are parsing legacy DT props and the DT contains a > > > * valid NFC node, forward the request to the sama5 logic. > > > */ > > > - if (of_find_compatible_node(pdev->dev.of_node, NULL, > > > - "atmel,sama5d3-nfc")) > > > + nfc_node = of_get_compatible_child(pdev->dev.of_node, > > > + "atmel,sama5d3-nfc"); > > > + if (nfc_node) { > > > caps = &atmel_sama5_nand_caps; > > > + of_node_put(nfc_node); > > > + } > > > > > > /* > > > * Even if the compatible says we are dealing with an > > > > > > > > > > /drivers/mtd/nand/atmel/nand-controller.c: In function > > 'atmel_hsmc_nand_controller_legacy_init': > > /drivers/mtd/nand/atmel/nand-controller.c:2080:11: error: implicit > > declaration of function 'of_get_compatible_child'; did you mean > > 'of_get_next_available_child'? [-Werror=implicit-function-declaration] > > nfc_np = of_get_compatible_child(dev->of_node, "atmel,sama5d3-nfc"); > > Looks like of_get_compatible_child() has been introduced in 4.18, hence > this error. > > Greg, can you drop this patch from 4.14.y? Yes, my fault, I fixed a number of these in the past, missed this one :( Now dropped. greg k-h