From patchwork Mon Mar 22 12:26:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 406137 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3530621jai; Mon, 22 Mar 2021 05:38:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzcGSYQHb01RDm9xvEkBOl2zxbytdsrMBo+Z6oGXY9psBN4xtfbzhGwJCPWtoAy8Nzn48a1 X-Received: by 2002:a05:6402:31b7:: with SMTP id dj23mr25968422edb.245.1616416695044; Mon, 22 Mar 2021 05:38:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1616416695; cv=none; d=google.com; s=arc-20160816; b=VeBOGnkjXLStAEHHRXsnZ+g9cRqRetZ2FbQ06/1Rf0UnuQ1A5jcn6F73ILNQmrIJMe RU87Wb1CHSHllPhJVU1BWD1RPZxU0NvENYv4WmOhSLAO00dHwu8N74nm8O+IlBWrLXFF ntS+S19IzkZM9qhcKkPAKvKmtV3wO+fYcRSRhOywvjDtP+sLi6IIoLTKQEKaioopGdtK lt1/3K7e0BjYLVSIQaUSx8BofTp4Dg0R8ik3pcEc6Kg3i85k7UMHyF9qlDO66TCBiq6W y0sCyGm+KqO4GjDIw52G/l3jl0fpL7lh6wDEDG8mn3ZtyVHXih6N4tSWAxhAdy1bUnZ0 VOhg== 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=Fakk6FxOEkeX7utmHgHyx5WlIMO1lvqRpSwkri77XEd1GxXsjmHhlhHNEPQndVHcs6 cgkQriZQlkvZTb0/q+k7zMZF4wINrNlGErUUlQN17LU0rPr41/J/exeoAGIjZ0DZ9MNg BEiOwJa8sbusl+Yg/8XkzQMnQcmKMl6xSjiCfqh7z8JUvf4aTceXjxKxpT2afx3TymhD RnobjidYJNFkhzPcZxglY5unaZXVQf0iYis7eTeS9OQn9p1y6vr0EXb+T7clcBV9iLrn i0mg1/umoaY7YN61dWBi3RC764i7zZmM2gPPYTu77BVAfIkPAy86JvPKN4POWXySg5vt iM8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=1oOOnKVR; 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 f11si11687942ejw.277.2021.03.22.05.38.14; Mon, 22 Mar 2021 05:38:15 -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=1oOOnKVR; 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 S231308AbhCVMhm (ORCPT + 12 others); Mon, 22 Mar 2021 08:37:42 -0400 Received: from mail.kernel.org ([198.145.29.99]:57028 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbhCVMgI (ORCPT ); Mon, 22 Mar 2021 08:36:08 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B180E619A4; Mon, 22 Mar 2021 12:35:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1616416549; bh=mA6n9q3KDXJcFo/kEYdcN1dVGe5Dx/XAbgn+TiqxXgI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1oOOnKVRaSPzyM0oCDERieQ2f1GJngh13lCBUWTNZtdMTWBgiedXiDC6rg13ZfxAy IzZ5cmw2zOTrKF7mk4qpY0fiJcZNTMNSN2/trYgPRapVR63MWUvUPBQzbuRHsFjQoQ NVGBpDlimY1iT4XlVgyigqM7lV1BcQdz3ntbXzaQ= 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.10 028/157] ASoC: qcom: sdm845: Fix array out of bounds access Date: Mon, 22 Mar 2021 13:26:25 +0100 Message-Id: <20210322121934.657333988@linuxfoundation.org> X-Mailer: git-send-email 2.31.0 In-Reply-To: <20210322121933.746237845@linuxfoundation.org> References: <20210322121933.746237845@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};