From patchwork Fri May 8 12:35:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 226208 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.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,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 38AAFC38A2A for ; Fri, 8 May 2020 12:55:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 114512054F for ; Fri, 8 May 2020 12:55:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942514; bh=72QHCKyTOD6djEwTkkbPYc1VL+si3jHQnpEU95wSY6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=T3xtLyY3qhpH5mopCoo8dHU2DS9Nl7vWGeHRBdnWzosQ2+1rMHXNa+4GXf36hEc4n B7ux2L1ZwSVz90wAQNuwpCwbZQCTKmBFhrZskyDBysf54v8MFQ8pNXzltoGf/GjM3i bs6JNACgNpNKHESH+NtJZ+Drt8TAGC/g0ukZtiRs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729773AbgEHMzM (ORCPT ); Fri, 8 May 2020 08:55:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:37926 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730300AbgEHMzK (ORCPT ); Fri, 8 May 2020 08:55:10 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D70852054F; Fri, 8 May 2020 12:55:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588942510; bh=72QHCKyTOD6djEwTkkbPYc1VL+si3jHQnpEU95wSY6o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q9oX5nGHrpUJLdyJkyBm5xQXEKkinpDWoP91GXJRG/uLJBcV5ovkIlRjKE4Q5KEY6 qQY7sJeb+KpiZ2Rcy33MWo0NH12G2X6kIPk/WcQbEp/uj2edqUX1lxfUURmd74QSAt UGfd66WmstRpi1bJ2GurhtrSGH9YJVqdZ9myqC4Y= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Amadeusz_S=C5=82awi=C5=84ski?= , Ranjani Sridharan , Pierre-Louis Bossart , Mark Brown , Sasha Levin Subject: [PATCH 5.6 07/49] ASoC: topology: Check return value of pcm_new_ver Date: Fri, 8 May 2020 14:35:24 +0200 Message-Id: <20200508123043.962137589@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200508123042.775047422@linuxfoundation.org> References: <20200508123042.775047422@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Amadeusz Sławiński [ Upstream commit b3677fc3d68dd942c92de52f0bd9dd8b472a40e6 ] Function pcm_new_ver can fail, so we should check it's return value and handle possible error. Signed-off-by: Amadeusz Sławiński Reviewed-by: Ranjani Sridharan Reviewed-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20200327204729.397-6-amadeuszx.slawinski@linux.intel.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/soc-topology.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index aa7714f2b78fd..ca0ac5372b293 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -2135,7 +2135,9 @@ static int soc_tplg_pcm_elems_load(struct soc_tplg *tplg, _pcm = pcm; } else { abi_match = false; - pcm_new_ver(tplg, pcm, &_pcm); + ret = pcm_new_ver(tplg, pcm, &_pcm); + if (ret < 0) + return ret; } /* create the FE DAIs and DAI links */