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

asoc: codecs: Revamp dev_index uses

Browse Source 
Add mod % 2 to allow dev_index to work with WSA2 Macro.
Also fix issues associated with incorrect parameter
checking of dev_index leading to potential array index
out-of-bounds issues.
Change WSA MODE mixer control to be SOC_SINGLE_EXT for
extra parameter validation.

Change-Id: I030ee64d87fa60c6b44feebf5ccb1265f4291cc1
Signed-off-by: Matthew Rice <quic_mrice@quicinc.com>
This commit is contained in:
Matthew Rice
2022-04-18 13:57:04 -07:00
parent f2b4941541
commit 22d45f2149
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -798,17 +798,17 @@ static int wsa_dev_mode_put(struct snd_kcontrol *kcontrol,
snd_soc_kcontrol_component(kcontrol); snd_soc_kcontrol_component(kcontrol);
struct wsa884x_priv *wsa884x = snd_soc_component_get_drvdata(component); struct wsa884x_priv *wsa884x = snd_soc_component_get_drvdata(component);
int dev_mode; int dev_mode;
int wsa_dev_index;
dev_mode = ucontrol->value.integer.value[0]; dev_mode = ucontrol->value.integer.value[0];
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);
/* Check if input parameter is in range */ /* Check if input parameter is in range */
if ((wsa884x->dev_mode + (wsa884x->dev_index - 1) * 2) < wsa_dev_index = (wsa884x->dev_index - 1) % 2;
(MAX_DEV_MODE * 2)) { if ((dev_mode + wsa_dev_index * 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[dev_mode + wsa_dev_index * 2];
wsa884x->dev_mode + (wsa884x->dev_index - 1) * 2];
} else { } else {
return -EINVAL; return -EINVAL;
} }
@@ -1211,7 +1211,7 @@ static const struct snd_kcontrol_new wsa884x_snd_controls[] = {
SOC_SINGLE_EXT("WSA Get DevNum", SND_SOC_NOPM, 0, UINT_MAX, 0, SOC_SINGLE_EXT("WSA Get DevNum", SND_SOC_NOPM, 0, UINT_MAX, 0,
wsa884x_get_dev_num, NULL), wsa884x_get_dev_num, NULL),
SOC_ENUM_EXT("WSA MODE", wsa_dev_mode_enum, SOC_SINGLE_EXT("WSA MODE", SND_SOC_NOPM, 0, 1, 0,
wsa_dev_mode_get, wsa_dev_mode_put), wsa_dev_mode_get, wsa_dev_mode_put),
SOC_SINGLE_EXT("COMP Switch", SND_SOC_NOPM, 0, 1, 0, SOC_SINGLE_EXT("COMP Switch", SND_SOC_NOPM, 0, 1, 0,
@@ -1947,6 +1947,7 @@ static int wsa884x_swr_probe(struct swr_device *pdev)
struct regmap_irq_chip *wsa884x_sub_regmap_irq_chip = NULL; struct regmap_irq_chip *wsa884x_sub_regmap_irq_chip = NULL;
u8 wo0_val; u8 wo0_val;
int sys_gain_size, sys_gain_length; int sys_gain_size, sys_gain_length;
int wsa_dev_index;
wsa884x = devm_kzalloc(&pdev->dev, sizeof(struct wsa884x_priv), wsa884x = devm_kzalloc(&pdev->dev, sizeof(struct wsa884x_priv),
@@ -2139,6 +2140,8 @@ static int wsa884x_swr_probe(struct swr_device *pdev)
/* Start in speaker mode by default */ /* Start in speaker mode by default */
wsa884x->dev_mode = SPEAKER; wsa884x->dev_mode = SPEAKER;
wsa884x->dev_index = dev_index; wsa884x->dev_index = dev_index;
/* wsa_dev_index is macro_agnostic index */
wsa_dev_index = (wsa884x->dev_index - 1) % 2;
wsa884x->macro_np = of_parse_phandle(pdev->dev.of_node, wsa884x->macro_np = of_parse_phandle(pdev->dev.of_node,
"qcom,wsa-macro-handle", 0); "qcom,wsa-macro-handle", 0);
if (wsa884x->macro_np) { if (wsa884x->macro_np) {
@@ -2148,7 +2151,7 @@ static int wsa884x_swr_probe(struct swr_device *pdev)
ret = of_property_read_u32_index( ret = of_property_read_u32_index(
wsa884x->macro_dev->dev.of_node, wsa884x->macro_dev->dev.of_node,
"qcom,wsa-rloads", "qcom,wsa-rloads",
dev_index - 1, wsa_dev_index,
&wsa884x->rload); &wsa884x->rload);
if (ret) { if (ret) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
@@ -2192,7 +2195,7 @@ static int wsa884x_swr_probe(struct swr_device *pdev)
goto err_mem; goto err_mem;
} }
wsa884x->system_gain = wsa884x->sys_gains[ wsa884x->system_gain = wsa884x->sys_gains[
wsa884x->dev_mode + (dev_index - 1) * 2]; wsa884x->dev_mode + wsa_dev_index * 2];
} else { } else {
dev_err(&pdev->dev, "%s: parent dev not found\n", dev_err(&pdev->dev, "%s: parent dev not found\n",
__func__); __func__);