From patchwork Tue Apr 17 17:11:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 133567 Delivered-To: patch@linaro.org Received: by 10.46.84.18 with SMTP id i18csp4951962ljb; Tue, 17 Apr 2018 10:12:17 -0700 (PDT) X-Google-Smtp-Source: AIpwx49/BAYAubiww7u9OG/60sdku/SavPCsY7jJkrTaHfa5Wd1Ez/p9OKZ59D5r0TaTDlUhRJ4V X-Received: by 10.28.232.202 with SMTP id f71mr1739867wmi.136.1523985137076; Tue, 17 Apr 2018 10:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1523985137; cv=none; d=google.com; s=arc-20160816; b=zN+iPrkAblvam1oD740WPWW0b5pS3bzH2Js8Oy8+Ms2sWVh1j3hGRDELcZXmrci0rd BPXRy4bqsp8AE6BO4dKMhHfFLIcCuFihg47FR4eaiGPBbtYqEsm+v34jNo2LQRkYi4Q/ JIoTTrO41Oql0F0RRRqFj5VMBWT+Nxyl/+jxAMXjBBfSYrgAmfTS7CzRBuAfYphaHy+N SuPu8De6F3GdCMyvHMUqX3nx0dt3DawWLheDoRL5W+JfRQ1ji2MHHBrMjfm8nUtWp7ED ky1E5Qw5Lxm/Qf3ZLbJJ3CT3URuMfSPFWhITrBCgkNvtieE4LQKvDS9aQ03vzQlyfL2B rtFg== 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=KIV2HeMlRH89C5BIgNxfqjXP5WjnzWFXce4Y/mjzhzLU3+xRUOyHwxp5/8a8gPyvSY 2qfimu9/lu7LO7ozC7aamqaLC4X3FN+kj0Bh1Q7cP/uOLlCXJXVfh+iEFLbtCHW+/9wO 9uQEnafOQ10LnZ5iBnEM+GhdIUOvLen5ZQaMEDzCF9RKN/ONWQBL1Hbz0K0pDJh118Yq FhjdtL1GaYRmJi7xYoVy6z9yUzkb7PI0p6btuFhDu3IpvravCZJ9aWq01e/9VA899Lmp kaYVIj6LBBXmYM5QBDk0804JCMTW5e9nlopD31ltPuLHBW9nsK1os8q7dQDrgY+ubRgq SXjw== 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=ZONlvUj9; 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 c136si7260049wmh.44.2018.04.17.10.12.16; Tue, 17 Apr 2018 10:12:17 -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=ZONlvUj9; 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 89522267672; Tue, 17 Apr 2018 19:11:58 +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 5EE08267680; Tue, 17 Apr 2018 19:11:55 +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 8220726766E for ; Tue, 17 Apr 2018 19:11:53 +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=ZONlvUj9pTni uLyGF2Ok7J1UgPswDjIM7NyZUfzWuQIX9Ox45GACU/9z/52oOef1KI085kutNDgJy44w8gBhhV2Jk +gdApDa5+LY4XEvFccQ/RnUqzY6sNRcNgsh2OgSF6TNILw959WW/zriKyIyh0SXj0K6YBqISUCDfH r7U74=; 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 1f8U91-0007vS-L8; Tue, 17 Apr 2018 17:11:51 +0000 Received: from broonie by debutante with local (Exim 4.90_1) (envelope-from ) id 1f8U91-0001wj-6l; Tue, 17 Apr 2018 18:11:51 +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:11:51 +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