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=-8.2 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 CDFB0C43331 for ; Mon, 30 Mar 2020 08:13:38 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5C97820732 for ; Mon, 30 Mar 2020 08:13:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="BtH5ZEBE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C97820732 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id B263B1607; Mon, 30 Mar 2020 10:12:46 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz B263B1607 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1585556016; bh=Ao4CnocQQXX7C4xjyQFV0wNvr6mzOp4i8V3kuMfBn04=; h=Subject:To:References:From:Date:In-Reply-To:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=BtH5ZEBEf54yGZ9ZufpRmpuSzXeaRKe2P2DcSNEFhWJ9aR1czNNvQRObSV8qFxrby f+6TploEG4Tj7xxtQz1ovgIjVtcgGbDNuz1H6S/chRdSdCvutzsWt3vr83AgPNdVoL zQrm8PQ3jT3VJZi2UOItQGD7Z6E9H784lAdmhIVU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 42C40F80145; Mon, 30 Mar 2020 10:12:46 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 1BDC6F80148; Mon, 30 Mar 2020 10:12:44 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 9F555F800EB for ; Mon, 30 Mar 2020 10:12:39 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 9F555F800EB IronPort-SDR: 5xdmNJ4EDugrrKk/kOeSI8I77pWKF4LLZMh7RqrNs2b8X+n5527fOVoMbIJhNGvMGGdxC15Sj5 PYutlurWGKhA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 01:12:37 -0700 IronPort-SDR: gaiOMh+alj66gW6Hz+QqEFWD5TSaaoUBMqn30ltst5jrGYgX/w47d+i0xwnQmJ5x3BXCs4QbDW TY6t81ea7t9A== X-IronPort-AV: E=Sophos;i="5.72,323,1580803200"; d="scan'208";a="395051175" Received: from aslawinx-mobl1.ger.corp.intel.com (HELO [10.249.135.1]) ([10.249.135.1]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Mar 2020 01:12:35 -0700 Subject: Re: [PATCH v2 3/6] ASoC: topology: Check return value of soc_tplg_*_create To: Pierre-Louis Bossart , Liam Girdwood , Mark Brown , Takashi Iwai References: <20200327204729.397-1-amadeuszx.slawinski@linux.intel.com> <20200327204729.397-4-amadeuszx.slawinski@linux.intel.com> From: =?UTF-8?Q?Amadeusz_S=c5=82awi=c5=84ski?= Message-ID: <41ce872f-7fa5-74cd-396b-9bfae989e91c@linux.intel.com> Date: Mon, 30 Mar 2020 10:12:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Cc: alsa-devel@alsa-project.org, Ranjani Sridharan X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 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: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" On 3/27/2020 7:56 PM, Pierre-Louis Bossart wrote: > > > On 3/27/20 3:47 PM, Amadeusz Sławiński wrote: >> Functions soc_tplg_denum_create, soc_tplg_dmixer_create, >> soc_tplg_dbytes_create can fail, so their return values should be >> checked and error should be propagated. >> >> Signed-off-by: Amadeusz Sławiński >> --- >> >>   v2: >>    Added this patch >> >>   sound/soc/soc-topology.c | 18 ++++++++++++------ >>   1 file changed, 12 insertions(+), 6 deletions(-) >> >> diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c >> index c3811dd66b68..860bced933d6 100644 >> --- a/sound/soc/soc-topology.c >> +++ b/sound/soc/soc-topology.c >> @@ -1124,6 +1124,7 @@ static int soc_tplg_kcontrol_elems_load(struct >> soc_tplg *tplg, >>       struct snd_soc_tplg_hdr *hdr) >>   { >>       struct snd_soc_tplg_ctl_hdr *control_hdr; >> +    int ret; >>       int i; >>       if (tplg->pass != SOC_TPLG_PASS_MIXER) { >> @@ -1152,25 +1153,30 @@ static int soc_tplg_kcontrol_elems_load(struct >> soc_tplg *tplg, >>           case SND_SOC_TPLG_CTL_RANGE: >>           case SND_SOC_TPLG_DAPM_CTL_VOLSW: >>           case SND_SOC_TPLG_DAPM_CTL_PIN: >> -            soc_tplg_dmixer_create(tplg, 1, >> -                           le32_to_cpu(hdr->payload_size)); >> +            ret = soc_tplg_dmixer_create(tplg, 1, >> +                    le32_to_cpu(hdr->payload_size)); >>               break; >>           case SND_SOC_TPLG_CTL_ENUM: >>           case SND_SOC_TPLG_CTL_ENUM_VALUE: >>           case SND_SOC_TPLG_DAPM_CTL_ENUM_DOUBLE: >>           case SND_SOC_TPLG_DAPM_CTL_ENUM_VIRT: >>           case SND_SOC_TPLG_DAPM_CTL_ENUM_VALUE: >> -            soc_tplg_denum_create(tplg, 1, >> -                          le32_to_cpu(hdr->payload_size)); >> +            ret = soc_tplg_denum_create(tplg, 1, >> +                    le32_to_cpu(hdr->payload_size)); >>               break; >>           case SND_SOC_TPLG_CTL_BYTES: >> -            soc_tplg_dbytes_create(tplg, 1, >> -                           le32_to_cpu(hdr->payload_size)); >> +            ret = soc_tplg_dbytes_create(tplg, 1, >> +                    le32_to_cpu(hdr->payload_size)); >>               break; >>           default: >>               soc_bind_err(tplg, control_hdr, i); >>               return -EINVAL; >>           } >> +        if (ret < 0) { >> +            dev_err(tplg->dev, "ASoC: invalid control\n"); >> +            return ret; >> +        } > > Sounds good, but this happens in a loop, so would all the memory > previously allocated by denum/dbytes/dmixer_create leak, or is it freed > automatically somewhere else? > Well, now that error is propagated, snd_soc_tplg_component_remove() should be called by snd_soc_tplg_component_load() in case of errors while parsing. From quick look it seems like it should be able to free it up correctly by calling remove_enum/bytes/mixer. Thanks, Amadeusz