From patchwork Tue Apr 17 17:09:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133559 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp4949484ljb; Tue, 17 Apr 2018 10:09:59 -0700 (PDT) X-Google-Smtp-Source: AIpwx48UEfrBg6vb1MYPGxxyMxfOaTc0nvlhTtuKJzgo3uX6pY0h7USrcTI6K9ZYjggNRvoaid5i X-Received: by 10.28.230.11 with SMTP id d11mr1517923wmh.129.1523984999385; Tue, 17 Apr 2018 10:09:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523984999; cv=none; d=google.com; s=arc-20160816; b=VWbRrFWBndUS3JB3VEu+b57punpBwxXx3FfkkpFhbwLNPPrhql2V80zOMpIN7Y3x/d Li/A0HHPVSgu0KMf0ImXY5OoH6HOAocS6hfCwpvpqfCWOMfFVmbYSDdAM6TsCwoPiqQe 34Oysgpqkcd7TVNumQoWCG9iCw5nwRirI/Fulvpzudu2NaXsGbQGoSAypesUZMY2XV3+ fwXRBA8dXytN2qWlxrXsnxMh1mknXksONhdgPvDqczQbpY4IU63TL+sRaQS8PtsLwTaG jKW2n4ILw+gGpApKDJKUWmJUhKYoZ//o61M80zTX4n+W4c35hOfToz//UNMj4BDd+gC5 cNtg== 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:arc-authentication-results; bh=KIDWERCE6nwHDUnbw8RgG3CmCiJrvBkY5B1jXzqqtoQ=; b=uzmE9mL5YJz5eLYMUL5EGMW2hoVLg5+vAyD7vM4FZQCeVvZWDyI6ZNls43SFuT//UD gnjESN6Rz1wRrTXyOjR4COUG+ck8Z73iAUKIRAT/oG2U2YHclhKSkeMdwO05KenVjVoY h17VZQuBxnbnI7ylVEBOARP/ssabe7XxuKZkqrV9aXcPfWO1ewHQfWaXFp92Tzn+S7A5 TaXEMIkVQMU0yR6WdKpx4NkNx03lGuxry+y3ru6Nq1VPXX3d/zld7tzW3Xsuo/xi+sgL u4+lX4uUUCoAU2ccAAg5Iv2M+lzvLJQop5Xf8ziccs58FXDHVYmshq+SbczaqoZO/aRa Lyow== 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=CkOBqKLz; 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 Return-Path: Received: from alsa0.perex.cz (alsa0.perex.cz. [77.48.224.243]) by mx.google.com with ESMTP id z69si7089348wmz.223.2018.04.17.10.09.59; Tue, 17 Apr 2018 10:09:59 -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=CkOBqKLz; 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 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 87471267627; Tue, 17 Apr 2018 19:09:32 +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 0E4B626763C; Tue, 17 Apr 2018 19:09:30 +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 E21C1267642 for ; Tue, 17 Apr 2018 19:09:27 +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=OFjCZoepWyMF4cpYpgNZLjw0U63Fh0O0BJb9zhrTmCI=; b=CkOBqKLz4Y2r U2PUUHSkUI3/PKimJvz5xDeSorUQXEkhT80/AAI99SbxA61wl8At747OlZ0Hriome7i0zeStxTFH9 WwCllKxkyil+t/30v8FGgpUYozcKMWGzpqyjoOa07L7aK2lYzkoRyWopzTRNQpn0Zek0swRWOVUxl qZwS8=; Received: from debutante.sirena.org.uk ([2001:470:1f1d:6b5::3] helo=debutante) by heliosphere.sirena.org.uk with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1f8U6f-0007tt-Tg; Tue, 17 Apr 2018 17:09:25 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8U6f-0001eL-FW; Tue, 17 Apr 2018 18:09:25 +0100 From: Mark Brown To: Liam Girdwood In-Reply-To: <20180327133045.29351-6-liam.r.girdwood@linux.intel.com> Message-Id: Date: Tue, 17 Apr 2018 18:09:25 +0100 Cc: alsa-devel@alsa-project.org, Mark Brown Subject: [alsa-devel] Applied "ASoC: topology: Check widget kcontrols before deref" 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: topology: Check widget kcontrols before deref 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 f53c4c20d6d38bcefd89bfcab135486cbb797884 Mon Sep 17 00:00:00 2001 From: Liam Girdwood Date: Tue, 27 Mar 2018 14:30:44 +0100 Subject: [PATCH] ASoC: topology: Check widget kcontrols before deref Validate the topology input before we dereference the pointer. Signed-off-by: Liam Girdwood Signed-off-by: Mark Brown --- sound/soc/soc-topology.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.0 _______________________________________________ Alsa-devel mailing list Alsa-devel@alsa-project.org http://mailman.alsa-project.org/mailman/listinfo/alsa-devel diff --git a/sound/soc/soc-topology.c b/sound/soc/soc-topology.c index 5598e891b2b3..986b8b2f90fb 100644 --- a/sound/soc/soc-topology.c +++ b/sound/soc/soc-topology.c @@ -513,7 +513,7 @@ static void remove_widget(struct snd_soc_component *comp, */ if (dobj->widget.kcontrol_type == SND_SOC_TPLG_TYPE_ENUM) { /* enumerated widget mixer */ - for (i = 0; i < w->num_kcontrols; i++) { + for (i = 0; w->kcontrols != NULL && i < w->num_kcontrols; i++) { struct snd_kcontrol *kcontrol = w->kcontrols[i]; struct soc_enum *se = (struct soc_enum *)kcontrol->private_value; @@ -530,7 +530,7 @@ static void remove_widget(struct snd_soc_component *comp, } } else { /* volume mixer or bytes controls */ - for (i = 0; i < w->num_kcontrols; i++) { + for (i = 0; w->kcontrols != NULL && i < w->num_kcontrols; i++) { struct snd_kcontrol *kcontrol = w->kcontrols[i]; if (dobj->widget.kcontrol_type