From patchwork Thu Apr 26 11:50:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 134509 Delivered-To: patch@linaro.org Received: by 10.46.151.6 with SMTP id r6csp2180570lji; Thu, 26 Apr 2018 04:51:12 -0700 (PDT) X-Google-Smtp-Source: AIpwx4+jZcdb9xBN16LzhRupe/zNqTVDsSfIIroq1w6elQh6Vc6iCf1cR5yeE9v8Ou8lYZXfRXvo X-Received: by 10.28.10.83 with SMTP id 80mr19336012wmk.70.1524743472541; Thu, 26 Apr 2018 04:51:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1524743472; cv=none; d=google.com; s=arc-20160816; b=O6AgucBWgHoVaKI8D/I89RvIXuYEjxlrF641UfY876/0lsLoWrlXldmq6pAKOO215S Mw/jUArVgu3bqzL7gTqtvb1KURS+dE6rkA1yM35GKQquHSVw6TOcbL2RWwsXiQeLGgzs S8cjm1wTrPO6tbC9+HJmuIy2tdGWCvoIBjQLTOPbZBPPaNy9qSTijfUdnUaygwXCigCm P/jWYy/erKj/zFLHJ5D3p2npVFzuOahdd/ocv7+R1FNXQvvlMvXo+e8o2KlkfM3aa8Zq 8KLmSDItguXtwdl4FqF5+dnvU8U/9x//ZEn20DXcIlYvNeAsgpO0I87RTHA8JAvcfUGy Oo3w== 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=ttt0b9DW9fXYmQa7RL50dNCQ4xNSJAmJsFjUZZ2Hw/BaOp+WpHRENfsDc9lxlOMuxh dQ7MsKQ4FGE81SQn+qpS6rRg0apoJMPjMx6boElVCgjB+pvugliSMg1bwambUZACkATi k5ZpKREL9bPxyZZXZex6t83suDrxsLZJdxYtIsM3X7mU4AR3EIR/p1PmiwAHfY8ueCxi K1Z1c924cV0qMtohVadIkGTaB8G1S+e3rSQLzKPn6G1LAmmNebho4y2kyklFt7G/Y1Wk J4BucO0BDJW1xhFbY2YCM7LsSBlBt+YrWfFHX7mf0QhgkvPeRzat9kbnxeXMBAcys7Qb h0mA== 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=quZNd5L5; 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 o15-v6si14506188wrm.397.2018.04.26.04.51.12; Thu, 26 Apr 2018 04:51:12 -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=quZNd5L5; 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 66D97267856; Thu, 26 Apr 2018 13:51:02 +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 3BEEF267871; Thu, 26 Apr 2018 13:51:00 +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 024BD26722C for ; Thu, 26 Apr 2018 13:50:51 +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=quZNd5L5eTE7 yfprovt2oJdrsQEloWF7v9wG+Lqgx0d/7iOhqnk+hymVw2i8cyTHAazORWQNEJQNZqZ99P0LlDOsr hRFJyQ2a6TA6G9XKLsBCn8Wu2sugc9jc3BbIPZAZiUW/NuG58ccWAlq+QbbVkJmW7qwBNCSVCO9lz /VWpg=; 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 1fBfQI-0005GK-0B; Thu, 26 Apr 2018 11:50:50 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1fBfQH-0007OW-DL; Thu, 26 Apr 2018 12:50:49 +0100 From: Mark Brown To: Liam Girdwood In-Reply-To: <20180327133045.29351-6-liam.r.girdwood@linux.intel.com> Message-Id: Date: Thu, 26 Apr 2018 12:50:49 +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