samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: lpass-cdc: Add check for array bound overflow"

Browse Source
This commit is contained in:
qctecmdr
2023-06-29 01:12:50 -07:00
committed by Gerrit - the friendly Code Review server
parent 92bb3f09f6 3daac9507a
commit 69a087fc8e
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
asoc/codecs/lpass-cdc/lpass-cdc-wsa-macro.c
View File

@@ -1390,6 +1390,7 @@ static int lpass_cdc_wsa_macro_config_compander(struct snd_soc_component *compon
struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL; struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL;
struct lpass_cdc_comp_setting *comp_settings = NULL; struct lpass_cdc_comp_setting *comp_settings = NULL;
u16 mode = 0; u16 mode = 0;
u16 index = 0;
int sys_gain, bat_cfg, sys_gain_int, upper_gain, lower_gain; int sys_gain, bat_cfg, sys_gain_int, upper_gain, lower_gain;
if (!lpass_cdc_wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__)) if (!lpass_cdc_wsa_macro_get_data(component, &wsa_dev, &wsa_priv, __func__))
@@ -1420,7 +1421,13 @@ static int lpass_cdc_wsa_macro_config_compander(struct snd_soc_component *compon
/* If System has battery configuration */ /* If System has battery configuration */
if (wsa_priv->wsa_bat_cfg[comp]) { if (wsa_priv->wsa_bat_cfg[comp]) {
sys_gain = wsa_priv->wsa_sys_gain[comp * 2 + wsa_priv->wsa_spkrrecv]; index = (comp * 2) + wsa_priv->wsa_spkrrecv;
if (index >= (2 * (LPASS_CDC_WSA_MACRO_RX1 + 1))) {
dev_err(component->dev, "%s: Invalid index: %d\n",
__func__, index);
return -EINVAL;
}
sys_gain = wsa_priv->wsa_sys_gain[index];
bat_cfg = wsa_priv->wsa_bat_cfg[comp]; bat_cfg = wsa_priv->wsa_bat_cfg[comp];
/* Convert enum to value and /* Convert enum to value and
* multiply all values by 10 to avoid float * multiply all values by 10 to avoid float

9
asoc/codecs/lpass-cdc/lpass-cdc-wsa2-macro.c
View File

@@ -1400,6 +1400,7 @@ static int lpass_cdc_wsa2_macro_config_compander(struct snd_soc_component *compo
struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL; struct lpass_cdc_wsa2_macro_priv *wsa2_priv = NULL;
struct lpass_cdc_comp_setting *comp_settings = NULL; struct lpass_cdc_comp_setting *comp_settings = NULL;
u16 mode = 0; u16 mode = 0;
u16 index = 0;
int sys_gain, bat_cfg, sys_gain_int, upper_gain, lower_gain; int sys_gain, bat_cfg, sys_gain_int, upper_gain, lower_gain;
if (!lpass_cdc_wsa2_macro_get_data(component, &wsa2_dev, &wsa2_priv, __func__)) if (!lpass_cdc_wsa2_macro_get_data(component, &wsa2_dev, &wsa2_priv, __func__))
@@ -1430,7 +1431,13 @@ static int lpass_cdc_wsa2_macro_config_compander(struct snd_soc_component *compo
/* If System has battery configuration */ /* If System has battery configuration */
if (wsa2_priv->wsa2_bat_cfg[comp]) { if (wsa2_priv->wsa2_bat_cfg[comp]) {
sys_gain = wsa2_priv->wsa2_sys_gain[comp * 2 + wsa2_priv->wsa2_spkrrecv]; index = (comp * 2) + wsa2_priv->wsa2_spkrrecv;
if (index >= (2 * (LPASS_CDC_WSA2_MACRO_RX1 + 1))) {
dev_err(component->dev, "%s: Invalid index: %d\n",
__func__, index);
return -EINVAL;
}
sys_gain = wsa2_priv->wsa2_sys_gain[index];
bat_cfg = wsa2_priv->wsa2_bat_cfg[comp]; bat_cfg = wsa2_priv->wsa2_bat_cfg[comp];
/* Convert enum to value and /* Convert enum to value and
* multiply all values by 10 to avoid float * multiply all values by 10 to avoid float