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

asoc: codecs: Fix Bolero and WSA out-of-range variables

Browse Source 
Found potential issues relating to uninitialized or out-of-bounds variables
present in codec drivers. Place checks to ensure proper ranges are used.

Change-Id: Ib68cba2413788a57237f1f18fc5ce5fb5c6bfb0a
Signed-off-by: Matthew Rice <quic_mrice@quicinc.com>
This commit is contained in:
Matthew Rice
2022-03-02 16:32:50 -08:00
committed by Gerrit - the friendly Code Review server
parent 018369d65f
commit 9d7405ec04
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1584,9 +1584,9 @@ static int lpass_cdc_wsa_macro_config_softclip(struct snd_soc_component *compone
static int lpass_cdc_was_macro_config_pbr(struct snd_soc_component *component, static int lpass_cdc_was_macro_config_pbr(struct snd_soc_component *component,
int path, int event) int path, int event)
{ {
u16 reg1, reg2, reg3;
struct device *wsa_dev = NULL; struct device *wsa_dev = NULL;
struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL; struct lpass_cdc_wsa_macro_priv *wsa_priv = NULL;
u16 reg1 = 0, reg2 = 0, reg3 = 0;
int softclip_path = 0; int softclip_path = 0;
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__))
@@ -1605,7 +1605,7 @@ static int lpass_cdc_was_macro_config_pbr(struct snd_soc_component *component,
} }
if (!wsa_priv->pbr_enable || wsa_priv->wsa_bat_cfg[path] >= EXT_1S || if (!wsa_priv->pbr_enable || wsa_priv->wsa_bat_cfg[path] >= EXT_1S ||
wsa_priv->wsa_sys_gain[path * 2] > G_12_DB || wsa_priv->wsa_sys_gain[path * 2] > G_12_DB ||
wsa_priv->wsa_spkrrecv) wsa_priv->wsa_spkrrecv || !reg1 || !reg2 || !reg3)
return 0; return 0;
if (SND_SOC_DAPM_EVENT_ON(event)) { if (SND_SOC_DAPM_EVENT_ON(event)) {

4
asoc/codecs/wsa884x/wsa884x.c
View File

@@ -758,7 +758,9 @@ static int wsa_dev_mode_put(struct snd_kcontrol *kcontrol,
dev_dbg(component->dev, "%s: Dev Mode current: %d, new: %d = %ld\n", dev_dbg(component->dev, "%s: Dev Mode current: %d, new: %d = %ld\n",
__func__, wsa884x->dev_mode, dev_mode); __func__, wsa884x->dev_mode, dev_mode);
if (dev_mode >= SPEAKER && dev_mode <= RECEIVER) { /* Check if input parameter is in range */
if ((wsa884x->dev_mode + (wsa884x->dev_index - 1) * 2) <
(MAX_DEV_MODE * 2)) {
wsa884x->dev_mode = dev_mode; wsa884x->dev_mode = dev_mode;
wsa884x->system_gain = wsa884x->sys_gains[ wsa884x->system_gain = wsa884x->sys_gains[
wsa884x->dev_mode + (wsa884x->dev_index - 1) * 2]; wsa884x->dev_mode + (wsa884x->dev_index - 1) * 2];