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=-9.7 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,URIBL_BLOCKED,USER_AGENT_GIT 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 624E9C433E0 for ; Mon, 6 Jul 2020 10:11:06 +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 DC20E20739 for ; Mon, 6 Jul 2020 10:11:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=alsa-project.org header.i=@alsa-project.org header.b="SCaDYkho" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DC20E20739 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 788D6167E; Mon, 6 Jul 2020 12:10:14 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 788D6167E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1594030264; bh=brP1UFdcHs4IjhyEsfzAHgzlq6CNmu70NsleAD1TNYM=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=SCaDYkhoep03tjXzx0ceKlOYK/NRhoFNAhHSdqhjPeXPfndCo+kXnsHIiByRLunFh nHOVkgTHFVPu/Vq3oG3AI6RjaQHDgX1m5e7IewuqPvH5SB39mUIj+gAaUsBEioWfy5 CRi371+377DAZwaQJ9z3m7eKt1Gnu0/9AKZv3GCk= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 02CF4F802DB; Mon, 6 Jul 2020 12:07:48 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3A93AF802A0; Mon, 6 Jul 2020 12:07:42 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (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 C75EAF8011F for ; Mon, 6 Jul 2020 12:07:35 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz C75EAF8011F IronPort-SDR: ntYwo/dT0WLFWe+mxKJMIZVI72jchIlJeWvMJFII3XsgcA3swpmzWWTkkTzzIpttm6HocmV/oB ZJAUhw2TOISQ== X-IronPort-AV: E=McAfee;i="6000,8403,9673"; a="135637959" X-IronPort-AV: E=Sophos;i="5.75,318,1589266800"; d="scan'208";a="135637959" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Jul 2020 03:07:32 -0700 IronPort-SDR: eCq9XNLWiLBIZ9HBUI9S9xKQ0o9OcAJm50yzQmqPr8lDTOVEcoxxrBIJn4z+7w0io1MZLeGE1H xO6UY0GRj/fQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.75,318,1589266800"; d="scan'208";a="313912984" Received: from test-hp-compaq-8100-elite-cmt-pc.igk.intel.com ([10.237.149.93]) by orsmga008.jf.intel.com with ESMTP; 06 Jul 2020 03:07:31 -0700 From: Piotr Maziarz To: alsa-devel@alsa-project.org Subject: [PATCH v2 01/10] topology: decode: Fix channel map memory allocation Date: Mon, 6 Jul 2020 11:05:54 +0200 Message-Id: <1594026363-30276-2-git-send-email-piotrx.maziarz@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1594026363-30276-1-git-send-email-piotrx.maziarz@linux.intel.com> References: <1594026363-30276-1-git-send-email-piotrx.maziarz@linux.intel.com> Cc: cezary.rojewski@intel.com, amadeuszx.slawinski@intel.com 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" Memory allocated on the stack was referenced outside of the function scope caused undefined behaviour. Change-Id: Iac0bfe7dabfd59494b78afba17cf2d3e0b429fef Signed-off-by: Piotr Maziarz --- src/topology/ctl.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/topology/ctl.c b/src/topology/ctl.c index 90241b6..6e6c1d1 100644 --- a/src/topology/ctl.c +++ b/src/topology/ctl.c @@ -1330,7 +1330,6 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, void *bin, size_t size) { struct snd_soc_tplg_enum_control *ec = bin; - struct snd_tplg_channel_map_template cmt; int i; if (size < sizeof(*ec)) { @@ -1375,11 +1374,13 @@ int tplg_decode_control_enum1(snd_tplg_t *tplg, } } - et->map = &cmt; - memset(&cmt, 0, sizeof(cmt)); - cmt.num_channels = ec->num_channels; - for (i = 0; i < cmt.num_channels; i++) { - struct snd_tplg_channel_elem *channel = &cmt.channel[i]; + et->map = tplg_calloc(heap, sizeof(struct snd_tplg_channel_map_template)); + if (!et->map) + return -ENOMEM; + et->map->num_channels = ec->num_channels; + for (i = 0; i < et->map->num_channels; i++) { + struct snd_tplg_channel_elem *channel = &et->map->channel[i]; + tplg_log(tplg, 'D', pos + ((void *)&ec->channel[i] - (void *)ec), "enum: channel size %d", ec->channel[i].size); channel->reg = ec->channel[i].reg; -- 2.7.4