From patchwork Fri May 12 11:46:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 681857 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 016ACC77B7F for ; Fri, 12 May 2023 11:47:21 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 308DC1DD; Fri, 12 May 2023 13:46:29 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 308DC1DD DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1683892039; bh=pe3FJEDN5yhlgWO9qxl+4rzfdblwTENuhY1tz6Vv120=; h=From:To:Cc:Subject:Date:List-Id:List-Archive:List-Help:List-Owner: List-Post:List-Subscribe:List-Unsubscribe:From; b=SUp/5kAowhQuRTzgDMtEqhHFWVDYBBLln0AYoL/AHdS07QbsJsz4GgzLDcWsqWuL4 IkPeE7ImH9y8zEQdLLPyjMlhg6ALppxKU2xZSXEC9hUOihRFzvruw40ezkqgavUDrc KRb1gz7ha+UAnHQwSwqNyvHsB/phjq6RLVpRqxi8= Received: by alsa1.perex.cz (Postfix, from userid 50401) id CDFA9F80542; Fri, 12 May 2023 13:46:00 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 6BAB5F80534; Fri, 12 May 2023 13:46:00 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 756FDF8052E; Fri, 12 May 2023 13:45:54 +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 604DDF8014C for ; Fri, 12 May 2023 13:45:43 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 604DDF8014C Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256 header.s=Intel header.b=OFu1fEHU DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1683891946; x=1715427946; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=pe3FJEDN5yhlgWO9qxl+4rzfdblwTENuhY1tz6Vv120=; b=OFu1fEHUofrg9DkvmJLIkH+ajT6ZvvZr+uon89ozLDwytkn+A9YzSwyn m+VtLfQay6OQwUQOaBhCNTzLc7GRVfCUQxtTRVR7qd3CtSpNXRr096puQ wxP3AVmNneAsq8WAeOZEq/e/w93ksWOxehcnnKwKCgsYaB5vnmOS98FCs gS2EzHscM3MPeu1DTzxuoRB6ehtYMRrpiKDb9nTucuKob3/opsWcusDfc KALDJsxsF5/2bZEbosUU7Lz7UMBK0ZRS33VsJ9bjWuy988madOyD6g1kv fsmjG/Oei/kw0Q19M52u3wkJMtEWlce65Bmt2J6FDFe1Dlalq5KTczPyo Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="340084868" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="340084868" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2023 04:45:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10707"; a="733017148" X-IronPort-AV: E=Sophos;i="5.99,269,1677571200"; d="scan'208";a="733017148" Received: from nhanph1x-mobl.amr.corp.intel.com (HELO pujfalus-desk.ger.corp.intel.com) ([10.249.38.84]) by orsmga001-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 12 May 2023 04:45:37 -0700 From: Peter Ujfalusi To: lgirdwood@gmail.com, broonie@kernel.org Cc: alsa-devel@alsa-project.org, pierre-louis.bossart@linux.intel.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, yung-chuan.liao@linux.intel.com Subject: [PATCH] ASoC: SOF: topology: Fix logic for copying tuples Date: Fri, 12 May 2023 14:46:30 +0300 Message-Id: <20230512114630.24439-1-peter.ujfalusi@linux.intel.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Message-ID-Hash: CAV62VJQRUQRIJ5EYOIG6XWXEWHJITLZ X-Message-ID-Hash: CAV62VJQRUQRIJ5EYOIG6XWXEWHJITLZ X-MailFrom: peter.ujfalusi@linux.intel.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Ranjani Sridharan Topology could have more instances of the tokens being searched for than the number of sets that need to be copied. Stop copying token after the limit of number of token instances has been reached. This worked before only by chance as we had allocated more size for the tuples array than the number of actual tokens being parsed. Fixes: 7006d20e5e9d ("ASoC: SOF: Introduce IPC3 ops") Signed-off-by: Ranjani Sridharan Reviewed-by: Péter Ujfalusi Reviewed-by: Bard Liao Reviewed-by: Pierre-Louis Bossart Signed-off-by: Peter Ujfalusi --- sound/soc/sof/topology.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/sof/topology.c b/sound/soc/sof/topology.c index d3d536b0a8f5..b80566570512 100644 --- a/sound/soc/sof/topology.c +++ b/sound/soc/sof/topology.c @@ -586,6 +586,10 @@ static int sof_copy_tuples(struct snd_sof_dev *sdev, struct snd_soc_tplg_vendor_ if (*num_copied_tuples == tuples_size) return 0; } + + /* stop when we've found the required token instances */ + if (found == num_tokens * token_instance_num) + return 0; } /* next array */