From patchwork Tue Sep 11 11:11:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 146435 Delivered-To: patch@linaro.org Received: by 2002:a2e:1648:0:0:0:0:0 with SMTP id 8-v6csp3511360ljw; Tue, 11 Sep 2018 04:11:31 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYR+4VkFca43mgHMCG6l47NPY35fqYEaIPlNYVsgraJz+vyfDnmgHbNfxTiyVLVYTQZaPIf X-Received: by 2002:a5d:6150:: with SMTP id y16-v6mr18992786wrt.141.1536664291210; Tue, 11 Sep 2018 04:11:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536664291; cv=none; d=google.com; s=arc-20160816; b=qQBnulopmqxE8sVB2j6KLYbQ209fEU8abdRSkYHzwC5cIgn2r8kR8W2HgCeZ7KRusk lucW6rfMoT14AVED2z8UXcmAEfON3uaHJa+byFxjkhj72dALwfhIz0Ngv6Oof178im0h t8DyMrxi1PHzHn5ZZraIbkELI+IAXLH0yklm6/24zmgzij3CnPantLucC8RVmKSX+Q7H jBqzbWTcOSaZ9X3OFVAENW+BvxaLXtDFPv5IgRPKyhv8zclPX9BDfQIo3DisacqdKmCC MGgmuahRNwCWNPt0MDk3pivOmFnDUkHqPQEm5KQcC2mC1kvvuxSkTXZ3DkToce5IPdpj z7BQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:cc:date:message-id:in-reply-to:to:from :dkim-signature:delivered-to; bh=JKH+Ouz7BD55mz04df5sB1W/yzT1xOOtQGOzYkPfVME=; b=rqyaMxsFYDP2q/dxSidbTXIfjEQrl67D+TMc0m4tJ0Cugmg+FUK4vWBkHgpU/0lbp7 bLkUT1LB4fz7qJjurUtZOZw0T2xvm9N1hvg73UMEQtR558ZLeK/aKebBprzks8dMJTjN BhglFVaygXiN+8dz8nRA4e/AjENHDL4xndHZYuYvbSm9kT8BrYd8USrwaOtkbKAFzboP PJh/GXYLzWFYDhPg4hj6eWyUaorsmU2S5pqthYJLXVAl2guO5GIuoBQWKpKbTuw1SW57 OuIqbBaobQXmjIeS8ryIo48sH3831w0y2nV/0JgnMurw3jf31sQpdj8TLDq01PVszAsy U5Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=TVCmCQoQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id g69-v6si544115wmd.50.2018.09.11.04.11.31; Tue, 11 Sep 2018 04:11:31 -0700 (PDT) Received-SPF: pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) client-ip=77.48.224.243; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@sirena.org.uk header.s=20170815-heliosphere header.b=TVCmCQoQ; spf=pass (google.com: domain of alsa-devel-bounces@alsa-project.org designates 77.48.224.243 as permitted sender) smtp.mailfrom=alsa-devel-bounces@alsa-project.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id C7254267806; Tue, 11 Sep 2018 13:11:29 +0200 (CEST) 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 C6AA3267821; Tue, 11 Sep 2018 13:11:26 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail1.perex.cz X-Spam-Level: X-Spam-Status: No, score=0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=disabled version=3.4.0 Received: from heliosphere.sirena.org.uk (heliosphere.sirena.org.uk [172.104.155.198]) by alsa0.perex.cz (Postfix) with ESMTP id A1B56267795 for ; Tue, 11 Sep 2018 13:11:24 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sirena.org.uk; s=20170815-heliosphere; h=Date:Message-Id:In-Reply-To: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Id:List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner: List-Archive; bh=1YvNflWWi5nseoqyD1lzXmR+ULpU9zt82Hh3+to4EqQ=; b=TVCmCQoQ8ArB pWE3GEkU+MRYNPbQ9K77Q8ZhVrYqx3i/KIr2X7jHILrRi+WajK3V2iyDtWNeaFmtnPZr2WixbRRAH DlRPsmUoYxnLG4EFKG57yDA7/m07m/25ch4hZPYBtSZxgN5SxzuJoSS4d+G1wLUY2N8P8h5k6dN9k Kp5C0=; Received: from cpc102320-sgyl38-2-0-cust46.18-2.cable.virginm.net ([82.37.168.47] helo=debutante.sirena.org.uk) by heliosphere.sirena.org.uk with esmtpa (Exim 4.89) (envelope-from ) id 1fzgZm-0004kf-Pl; Tue, 11 Sep 2018 11:11:22 +0000 Received: by debutante.sirena.org.uk (Postfix, from userid 1000) id 7665C1121AF8; Tue, 11 Sep 2018 12:11:22 +0100 (BST) From: Mark Brown To: Charles Keepax In-Reply-To: Message-Id: <20180911111122.7665C1121AF8@debutante.sirena.org.uk> Date: Tue, 11 Sep 2018 12:11:22 +0100 (BST) Cc: alsa-devel@alsa-project.org, Mark Brown , Dan Carpenter Subject: [alsa-devel] Applied "ASoC: dapm: Add missing return value check for snd_soc_dapm_new_dai" to the asoc tree 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 The patch ASoC: dapm: Add missing return value check for snd_soc_dapm_new_dai has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From e36a1d0d249aa09f94d551cadf043a7f9f7fae00 Mon Sep 17 00:00:00 2001 From: Charles Keepax Date: Mon, 10 Sep 2018 15:28:39 +0100 Subject: [PATCH] ASoC: dapm: Add missing return value check for snd_soc_dapm_new_dai snd_soc_dapm_new_dai may return an error pointer and currently this isn't checked for in dapm_connect_dai_link_widgets. Add code to check the return value and not add routes in that case. Fixes: 778ff5bb8689 ("ASoC: dapm: Move connection of CODEC to CODEC DAIs") Reported-by: Dan Carpenter Signed-off-by: Charles Keepax Signed-off-by: Mark Brown --- sound/soc/soc-dapm.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.19.0.rc2 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index 0dcdcc23dcfd..43983c69f6aa 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -4087,6 +4087,13 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, playback = snd_soc_dapm_new_dai(card, rtd, playback_cpu, codec); + if (IS_ERR(playback)) { + dev_err(rtd->dev, + "ASoC: Failed to create DAI %s: %ld\n", + codec_dai->name, + PTR_ERR(playback)); + continue; + } snd_soc_dapm_add_path(&card->dapm, playback_cpu, playback, NULL, NULL); @@ -4099,7 +4106,9 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, snd_soc_dapm_add_path(&card->dapm, playback, codec, NULL, NULL); } + } + for_each_rtd_codec_dai(rtd, i, codec_dai) { /* connect BE DAI capture if widgets are valid */ codec = codec_dai->capture_widget; @@ -4108,6 +4117,13 @@ static void dapm_connect_dai_link_widgets(struct snd_soc_card *card, capture = snd_soc_dapm_new_dai(card, rtd, codec, capture_cpu); + if (IS_ERR(capture)) { + dev_err(rtd->dev, + "ASoC: Failed to create DAI %s: %ld\n", + codec_dai->name, + PTR_ERR(capture)); + continue; + } snd_soc_dapm_add_path(&card->dapm, capture, capture_cpu, NULL, NULL);