Received: by 2002:a05:6a10:2726:0:0:0:0 with SMTP id ib38csp637269pxb; Tue, 5 Apr 2022 16:50:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwx4CpXsvucIA3NRFcdODsjPgXmB51AGjAOask2BrWZbhd93fGxXLDNzZ7Z9NfOLjvhKZWA X-Received: by 2002:a63:5560:0:b0:399:4e32:42 with SMTP id f32-20020a635560000000b003994e320042mr4838981pgm.164.1649202627622; Tue, 05 Apr 2022 16:50:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1649202627; cv=none; d=google.com; s=arc-20160816; b=P1qOTFvqQCgXZkPCHCtZbmAifpkRevyXH/IvedHdpZTfmN0mbdm8ocxZbzNdDSWNy+ c3Ls3J1+5AkOGlW81LqZF1Z615UNrhnRttDby/XZy7WA6A7DRBuj/yFjF8HuYicWTa1u a9JPvEkIZL9/0cd44SrKG+70J4Yqdw1z4oL6D4vM3UpWHkIOMl3eUPpOglW0kVrUPhsl 43qXkopMuJ3a4JVo1J00wTfnF74XvM5OydismP+auC8soq/gFLKH36OjFszTC13fbbUf NPMukKrYD2RLEZ+4xV189atu/UC5De67HuXY/fGyAHds2PA9yFR0rMPL/LTgLh7NI/Yg uaeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m1w+PFkmM7YSIwe8BCSPwgw4x6p4SbIQaayUdHsGuS0=; b=e0YPvxvRTp7bv79KlNZpPS5KMnkqzvKlI9P3WGhoijd0nK0huMV8d/zwrIebkFJBCu cBAoKE4VNH1xKcZIF2REpW5jRB6bhghlktJWpS2ROYXh9Ymao+wIaH0JN1HwzxzUiL3Z PSaCS1MEtV4vunWlhyISCBCtOGuTM0Bm2segxt5rsG/oZgd23nk9fqVnqw0JxzOXGRUK npn0stHSXloL+3GavxZ6oLtODfBrMJMZoP557GhM6ava0g8Mkw74g/OmLnvGLZbDr5TR eBAUMhjQsIepr3zYNL1MUW7Jkdb60M3XLlmyJTaecz96nsOFgzFPfvS+ZzdIY4tVXtuX S60Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uk8cuZU3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id o11-20020a170902d4cb00b00156bb3c32b4si5169037plg.323.2022.04.05.16.50.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Apr 2022 16:50:27 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=uk8cuZU3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 48C48139CFC; Tue, 5 Apr 2022 16:34:47 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1354309AbiDELzK (ORCPT + 99 others); Tue, 5 Apr 2022 07:55:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244920AbiDEIwr (ORCPT ); Tue, 5 Apr 2022 04:52:47 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DDAB24964; Tue, 5 Apr 2022 01:46:32 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id B04CBCE1BF9; Tue, 5 Apr 2022 08:46:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CE587C385A0; Tue, 5 Apr 2022 08:46:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1649148389; bh=NN0vJIBuGCtlaQSMcjfgiwVNSGvm5zjQua0pka742AE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uk8cuZU339ioBvFB2o0atzLRT8Risi6HzURZF2zQabylu0dmG7nl5Yc84b/8WdYri 0+Qg++qRJe9pRSsV/HIFLQQ7CdRNzROb08s8CAuAu4hivFjXU23WuA2NDI/v1RnGOD GXCDrpSg+t2Zs9+i7TsGe+h6s5iTQrLJLmkmZkDA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Srinivas Kandagatla , Mark Brown , Sasha Levin Subject: [PATCH 5.16 0338/1017] ASoC: codecs: rx-macro: fix accessing compander for aux Date: Tue, 5 Apr 2022 09:20:51 +0200 Message-Id: <20220405070404.315868114@linuxfoundation.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220405070354.155796697@linuxfoundation.org> References: <20220405070354.155796697@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Srinivas Kandagatla [ Upstream commit 42c709c4e1ce4c136891530646c9abd5dff3524f ] AUX interpolator does not have compander, so check before accessing compander data for this. Without this checkan array of out bounds access will be made in comp_enabled[] array. Fixes: 4f692926f562 ("ASoC: codecs: lpass-rx-macro: add dapm widgets and route") Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20220222183212.11580-2-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/lpass-rx-macro.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 2b272a82eabf..32e85d2e9b90 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -2039,6 +2039,10 @@ static int rx_macro_load_compander_coeff(struct snd_soc_component *component, int i; int hph_pwr_mode; + /* AUX does not have compander */ + if (comp == INTERP_AUX) + return 0; + if (!rx->comp_enabled[comp]) return 0; -- 2.34.1