From patchwork Mon Mar 22 12:26:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "gregkh@linuxfoundation.org" X-Patchwork-Id: 406130 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3526376jai; Mon, 22 Mar 2021 05:32:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyXpaaJ7Jdbo/vVllyY2Eout3F9g0vDfhdec/4yEqXEVGsLdcG0Yzp7HqjAVoS3hGufa4i2 X-Received: by 2002:aa7:c3c4:: with SMTP id l4mr25086869edr.335.1616416354530; Mon, 22 Mar 2021 05:32:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616416354; cv=none; d=google.com; s=arc-20160816; b=uIbek4xGYIBunpwNaF/ftE42QiMNoWnfH35SYKYVE41vIvEYmat8sfrjWbDHOelOH2 W7/7YIXoAa0fCWl1ev5PP3A0NLSDoi5BCnUO5PuFWecxG2e7j3w5JXsIQrrGHJHXR7Ce Mfpc+xr+Fqnt4I7VK0Cbg+5ELXV5WwZlCz6pCOgj+DR0QmW2qpaep4Aja0k+7xO1V8Uh WCryrxHb+yWwjrVH6dHnmYDinlC5WqgYW3eh5VP+xox/4BHkZfYROfgUaIbwHBRsWqoe 9xXrnfqDWTOfUcSPDPRF1xCzggNduGDUmL/ptyb+0h5kZe9BPwOyeC52fkmfJhLrhG5b SxDA== 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=clkgqUaRlH9zRJ3LEOibfJzsEe5eTlyZp0vqBC+HBMQ=; b=xyed+oHl6MXmqRWIanb+WxehGtBWSkeRRNE4lyHYAtldye8YrVAW6wyZjWBJJ4JFq+ pgx4zwbqNFaks3q5AzKeZBlFyQCkrcVhFYH51Myb7Iut5ThbwqMYlsMaBxNKbmziG21o PAQ+mCPL0/t5n3EeD1ejlUA393g5hP9QFxUBPsce7ZLbAwMcY647i/K5/Zh8xOsJKDwv 4W25LWt4rZA+5A4Nvvk4GcyfdghpOExINF15aA55UOODOyEt8vxbTfkkDO+d1VbFGMUk jJFRUgo8Yd0lBz33A5ybBYBeft34EDPWWZANjfhvMlnnARi2MspDMP8EdC6rPvJuZha1 tG7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="HA/3qnXC"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r21si11105155edy.321.2021.03.22.05.32.34; Mon, 22 Mar 2021 05:32:34 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="HA/3qnXC"; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231421AbhCVMcD (ORCPT + 12 others); Mon, 22 Mar 2021 08:32:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:53916 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231373AbhCVMba (ORCPT ); Mon, 22 Mar 2021 08:31:30 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6577260C3D; Mon, 22 Mar 2021 12:31:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416289; bh=mA6n9q3KDXJcFo/kEYdcN1dVGe5Dx/XAbgn+TiqxXgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HA/3qnXCjRnZsjNQ6a5R4E20Fd9j/u33s/I3ZcTK29OLXZMGy+Xv93MU63zosgwtE zTnJEhYgpAUWidttY4utb5eQGJzN7c4rKLWqopNASbDkufIMPOQ91raVl/MoGHOMAu 0VvqlD2AwAUjfEccYkgGJ8MyMSRAWN5WkwWySKn0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, John Stultz , Srinivas Kandagatla , Mark Brown Subject: [PATCH 5.11 033/120] ASoC: qcom: sdm845: Fix array out of bounds access Date: Mon, 22 Mar 2021 13:26:56 +0100 Message-Id: <20210322121930.763557603@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121929.669628946@linuxfoundation.org> References: <20210322121929.669628946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Srinivas Kandagatla commit 1c668e1c0a0f74472469cd514f40c9012b324c31 upstream. Static analysis Coverity had detected a potential array out-of-bounds write issue due to the fact that MAX AFE port Id was set to 16 instead of using AFE_PORT_MAX macro. Fix this by properly using AFE_PORT_MAX macro. Fixes: 1b93a8843147 ("ASoC: qcom: sdm845: handle soundwire stream") Reported-by: John Stultz Signed-off-by: Srinivas Kandagatla Link: https://lore.kernel.org/r/20210309142129.14182-2-srinivas.kandagatla@linaro.org Signed-off-by: Mark Brown Signed-off-by: Greg Kroah-Hartman --- sound/soc/qcom/sdm845.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/sound/soc/qcom/sdm845.c +++ b/sound/soc/qcom/sdm845.c @@ -33,12 +33,12 @@ struct sdm845_snd_data { struct snd_soc_jack jack; bool jack_setup; - bool stream_prepared[SLIM_MAX_RX_PORTS]; + bool stream_prepared[AFE_PORT_MAX]; struct snd_soc_card *card; uint32_t pri_mi2s_clk_count; uint32_t sec_mi2s_clk_count; uint32_t quat_tdm_clk_count; - struct sdw_stream_runtime *sruntime[SLIM_MAX_RX_PORTS]; + struct sdw_stream_runtime *sruntime[AFE_PORT_MAX]; }; static unsigned int tdm_slot_offset[8] = {0, 4, 8, 12, 16, 20, 24, 28};