diff options
| author | JohnnLee <johnnlee@google.com> | 2022-03-25 10:25:52 +0800 |
|---|---|---|
| committer | JohnnLee <johnnlee@google.com> | 2022-03-25 10:25:52 +0800 |
| commit | 8ba12fbc3f3c8ffe42bca10157e6c10485fd22d8 (patch) | |
| tree | 6424cb2511b393753a5a10ad7a84dc8aef2d8d4f | |
| parent | c8b97c12e9bbb22a8abaeb3016e24e749bf02565 (diff) | |
| parent | ad59b31b3cd15d9e2e07eadbdeaf63008792c57e (diff) | |
| download | msm-extra-8ba12fbc3f3c8ffe42bca10157e6c10485fd22d8.tar.gz | |
Merge branch 'LA.UM.9.12.C10.11.00.00.840.265' via branch 'qcom-msm-4.19-7250' into android-msm-pixel-4.19android-t-qpr3-beta-2_r0.2android-t-qpr3-beta-1_r0.2android-t-qpr2-beta-3_r0.2android-t-qpr2-beta-3.2_r0.3android-t-qpr2-beta-2_r0.2android-t-qpr2-beta-1_r0.3android-t-qpr1-beta-3_r0.1android-t-qpr1-beta-2_r0.3android-t-qpr1-beta-1_r0.2android-t-beta-4_r0.3android-t-beta-3_r0.3android-t-beta-3.3_r0.3android-t-beta-3.2_r0.3android-13.0.0_r0.72android-13.0.0_r0.67android-13.0.0_r0.62android-13.0.0_r0.57android-13.0.0_r0.52android-13.0.0_r0.47android-13.0.0_r0.42android-13.0.0_r0.3android-13.0.0_r0.18android-13.0.0_r0.13android-msm-redbull-4.19-t-qpr3-beta-2android-msm-redbull-4.19-t-qpr2-beta-3.2android-msm-redbull-4.19-t-qpr2-beta-1android-msm-redbull-4.19-t-qpr1-beta-2android-msm-redbull-4.19-t-beta-4android-msm-redbull-4.19-t-beta-3android-msm-redbull-4.19-android13-qpr3-beta1android-msm-redbull-4.19-android13-qpr2-betaandroid-msm-redbull-4.19-android13-qpr2android-msm-redbull-4.19-android13-qpr1-beta-3android-msm-redbull-4.19-android13-qpr1-betaandroid-msm-redbull-4.19-android13-qpr1android-msm-redbull-4.19-android13
Bug: 223958127
Signed-off-by: JohnnLee <johnnlee@google.com>
Change-Id: I8f0ea5df66808aad098a2da633f62ede0d8cc792
| -rw-r--r-- | asoc/msm-pcm-routing-v2.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/asoc/msm-pcm-routing-v2.c b/asoc/msm-pcm-routing-v2.c index d0ce8714..d01f3560 100644 --- a/asoc/msm-pcm-routing-v2.c +++ b/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> @@ -1667,6 +1668,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; |