From patchwork Wed Jan 31 05:59:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 10193273 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3E1D960595 for ; Wed, 31 Jan 2018 06:02:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DAAC28475 for ; Wed, 31 Jan 2018 06:02:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1731D283E8; Wed, 31 Jan 2018 06:02:21 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F03A7283E8 for ; Wed, 31 Jan 2018 06:02:17 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 9640E26762F; Wed, 31 Jan 2018 07:02:12 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id C4EA02677A1; Wed, 31 Jan 2018 07:02:11 +0100 (CET) Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by alsa0.perex.cz (Postfix) with ESMTP id 387D8267503 for ; Wed, 31 Jan 2018 07:02:04 +0100 (CET) Received: by mail-pg0-f65.google.com with SMTP id o13so9239200pgs.2 for ; Tue, 30 Jan 2018 22:02:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=huurzlduoxUt56kOmAa4u+8vw5YaVEsKYD9OIiytAVk=; b=ByNGWQoh5B/viby8FWK8Qg+/uVaDKGFiLA4toQxwKPnK2uTpD1+fFb+ZS9vjW/Ab0O 4FZ95fR74+/LgPEJ8CLEZYSr2gqNtExDNnqxnl/K+R4D7dOGuTJd726FFC1NoMyKMG04 nFDTGQ0OzYS1HbPVwFqFsvtZLGEOt1zEcCRStUSwGn/THnI0A4H4vXM5qosbQtri02La ngIox0fVhCa6hXhuMc37Za33Uh9y84V+NCQHHxBKYd/Ce6fPUwK6KRCSAXKVB9TlXwwu pIsC13hqhL3J3fcJwkpS2H3zHihFnK+3bj3Umhl1wn6coOHG10hNxXN4Uz94OC/9gv8F AX/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=huurzlduoxUt56kOmAa4u+8vw5YaVEsKYD9OIiytAVk=; b=ATL3UAzIC4JoeTFCzwezbtkXQdJeXWdUlONj1OmlbztEuUx3GN5cVmrFVWkUHXcpry n/uJBwQzcAhZdv1Q2oe0hB1/AK5YzEUuEX13KTsTMUQx7l55Ul+fcmZFTRzHMFo4QyBl OVqCjape5Y61Q+bTARIPlvqD8+V1gK5stMG3zT39YBIkskge5RphzqFYJBbq8nBs9Ajg 3brmfATSNUU15OqZOlOBmerNYQPa6YabZ6mEhBYVjd/DQGdZF85tYFJr6Zvu1REizZg4 iWEXCateLGaCne32Rz1CDFFbarq8jcV1x5jxfi7Q6n6fii8UTg0Kc2JCRLvn4B1K+Op/ VcSA== X-Gm-Message-State: AKwxyteXsq77qFzcARYw4OaIkcHEH66UABNqAq6RxVf5DEkcM0Io1Q0U b7Px77iiAWWRTRxxhb2STtk= X-Google-Smtp-Source: AH8x227XTXSs4KFeRVYTBqVlX9biF7zZ0IeLwHar54kPLFEAq4508XnPGcZK2iFGtnY+2BgUQd7aUw== X-Received: by 2002:a17:902:3343:: with SMTP id a61-v6mr3466959plc.185.1517378523547; Tue, 30 Jan 2018 22:02:03 -0800 (PST) Received: from pi.iht.com.au ([203.87.124.230]) by smtp.gmail.com with ESMTPSA id o25sm24666267pgc.75.2018.01.30.22.02.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 30 Jan 2018 22:02:02 -0800 (PST) X-Google-Original-Sender: Received: from johan by pi.iht.com.au with local (Exim 4.89) (envelope-from ) id 1eglSL-0006iI-Ob; Wed, 31 Jan 2018 17:01:13 +1100 From: Johan Hovold To: Mark Brown Date: Wed, 31 Jan 2018 16:59:21 +1100 Message-Id: <20180131055921.25574-1-johan@kernel.org> X-Mailer: git-send-email 2.13.6 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Johan Hovold , Liam Girdwood , linux-mediatek@lists.infradead.org, PC Liao , Matthias Brugger Subject: [alsa-devel] [PATCH] ASoC: mt8173-rt5650: fix child-node lookup X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP This driver used the wrong OF-helper when looking up the optional capture-codec child node during probe. Instead of searching just children of the sound node, a tree-wide depth-first search starting at the unrelated platform node was done. Not only could this end up matching an unrelated node or no node at all; the platform node could also be prematurely freed since of_find_node_by_name() drops a reference to its first argument. This particular pattern has been observed leading to crashes after probe deferrals in other drivers. Fix this by dropping the broken call to of_find_node_by_name() and keeping only the second, correct lookup using of_get_child_by_name() while taking care not to bail out if the optional node is missing. Note that this also addresses two capture-codec node-reference leaks (one for each of the original helper calls). Compile tested only. Fixes: d349caeb0510 ("ASoC: mediatek: Add second I2S on mt8173-rt5650 machine driver") Cc: PC Liao Signed-off-by: Johan Hovold --- sound/soc/mediatek/mt8173/mt8173-rt5650.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index 40ebefd625c1..679fc8bea0a3 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c @@ -272,15 +272,10 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) } mt8173_rt5650_codecs[1].of_node = mt8173_rt5650_codecs[0].of_node; - if (of_find_node_by_name(platform_node, "codec-capture")) { - np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); - if (!np) { - dev_err(&pdev->dev, - "%s: Can't find codec-capture DT node\n", - __func__); - return -EINVAL; - } + np = of_get_child_by_name(pdev->dev.of_node, "codec-capture"); + if (np) { ret = snd_soc_of_get_dai_name(np, &codec_capture_dai); + of_node_put(np); if (ret < 0) { dev_err(&pdev->dev, "%s codec_capture_dai name fail %d\n",