diff options
| author | changyan <changyan@google.com> | 2022-03-18 08:38:17 +0000 |
|---|---|---|
| committer | changyan <changyan@google.com> | 2022-03-18 08:39:47 +0000 |
| commit | 4494723b50bfeb304235c4fab28ad0d93eb5d2b2 (patch) | |
| tree | e510ff7183d3afc3d4e42055ff68730184e4da06 | |
| parent | 542bc9634f0f09bbb88aee28180dbf8fd7ec6b15 (diff) | |
| parent | 6fec0645c783ea4dd693e57c4f25300e0bd4781a (diff) | |
| download | msm-extra-android-msm-sunfish-4.14-t-beta-3.tar.gz | |
Merge commit 'qcom/release/LA.UM.9.1.C11.11.00.00.841.243' via branch 'qcom-msm-4.14' into android-msm-pixel-4.14android-t-qpr1-beta-1_r0.1android-t-beta-4_r0.2android-t-beta-4_r0.1android-t-beta-3_r0.2android-t-beta-3_r0.1android-t-beta-3.3_r0.2android-t-beta-3.3_r0.1android-t-beta-3.2_r0.2android-t-beta-3.2_r0.1android-13.0.0_r0.2android-13.0.0_r0.12android-13.0.0_r0.11android-13.0.0_r0.1android-msm-sunfish-4.14-t-beta-4android-msm-sunfish-4.14-t-beta-3android-msm-sunfish-4.14-android13-qpr1-betaandroid-msm-coral-4.14-t-beta-4android-msm-coral-4.14-t-beta-3
Bug: 225291828
Change-Id: Id286fd982d39d235bbce3dbb81a1f7f93891a098
Signed-off-by: changyan <changyan@google.com>
| -rw-r--r-- | 4.0/asoc/msm-pcm-routing-v2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/4.0/asoc/msm-pcm-routing-v2.c b/4.0/asoc/msm-pcm-routing-v2.c index a690c7c9..5ba11ea3 100644 --- a/4.0/asoc/msm-pcm-routing-v2.c +++ b/4.0/asoc/msm-pcm-routing-v2.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* Copyright (c) 2012-2021, The Linux Foundation. All rights reserved. + * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include <linux/init.h> @@ -1657,6 +1658,11 @@ static int msm_pcm_routing_channel_mixer_v2(int fe_id, bool perf_mode, } be_id = channel_mixer_v2[fe_id][sess_type].port_idx - 1; + if (be_id < 0 || be_id >= MSM_BACKEND_DAI_MAX) { + pr_err("%s: Received out of bounds be_id %d\n", + __func__, be_id); + return -EINVAL; + } channel_mixer_v2[fe_id][sess_type].input_channels[0] = channel_mixer_v2[fe_id][sess_type].input_channel; |