evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ASoC: msm8998: Add check before dereferencing pointer

Browse source 
Add check for pinctrl structure pointer before
dereferencing to avoid invalid memory access.

CRs-fixed: 1116515
Change-Id: I91e08278270ba24b6776975a651b75e0d83dc3d0
Signed-off-by: Karthikeyan Mani <kmani@codeaurora.org>
This commit is contained in:
Karthikeyan Mani 2017-03-06 15:19:49 -08:00
parent cf5ecb508b
commit e4b6a6967b
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sound/soc/msm/msm8998.c
View file

@ -4023,6 +4023,13 @@ static int msm_set_pinctrl(struct msm_pinctrl_info *pinctrl_info,
ret = -EINVAL; ret = -EINVAL;
goto err; goto err;
} }
if (pinctrl_info->pinctrl == NULL) {
pr_err("%s: pinctrl_info->pinctrl is NULL\n", __func__);
ret = -EINVAL;
goto err;
}
curr_state = pinctrl_info->curr_state; curr_state = pinctrl_info->curr_state;
pinctrl_info->curr_state = new_state; pinctrl_info->curr_state = new_state;
pr_debug("%s: curr_state = %s new_state = %s\n", __func__, pr_debug("%s: curr_state = %s new_state = %s\n", __func__,
@ -4291,6 +4298,7 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card); struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);
struct msm_pinctrl_info *pinctrl_info = &pdata->pinctrl_info; struct msm_pinctrl_info *pinctrl_info = &pdata->pinctrl_info;
int ret_pinctrl = 0;
dev_dbg(rtd->card->dev, dev_dbg(rtd->card->dev,
"%s: substream = %s stream = %d, dai name %s, dai ID %d\n", "%s: substream = %s stream = %d, dai name %s, dai ID %d\n",
@ -4305,11 +4313,10 @@ static int msm_mi2s_snd_startup(struct snd_pcm_substream *substream)
goto done; goto done;
} }
if (index == QUAT_MI2S) { if (index == QUAT_MI2S) {
ret = msm_set_pinctrl(pinctrl_info, STATE_MI2S_ACTIVE); ret_pinctrl = msm_set_pinctrl(pinctrl_info, STATE_MI2S_ACTIVE);
if (ret) { if (ret_pinctrl) {
pr_err("%s: MI2S TLMM pinctrl set failed with %d\n", pr_err("%s: MI2S TLMM pinctrl set failed with %d\n",
__func__, ret); __func__, ret_pinctrl);
goto done;
} }
} }
@ -4368,6 +4375,7 @@ static void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
struct snd_soc_card *card = rtd->card; struct snd_soc_card *card = rtd->card;
struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card); struct msm_asoc_mach_data *pdata = snd_soc_card_get_drvdata(card);
struct msm_pinctrl_info *pinctrl_info = &pdata->pinctrl_info; struct msm_pinctrl_info *pinctrl_info = &pdata->pinctrl_info;
int ret_pinctrl = 0;
pr_debug("%s(): substream = %s stream = %d\n", __func__, pr_debug("%s(): substream = %s stream = %d\n", __func__,
substream->name, substream->stream); substream->name, substream->stream);
@ -4388,10 +4396,10 @@ static void msm_mi2s_snd_shutdown(struct snd_pcm_substream *substream)
mutex_unlock(&mi2s_intf_conf[index].lock); mutex_unlock(&mi2s_intf_conf[index].lock);
if (index == QUAT_MI2S) { if (index == QUAT_MI2S) {
ret = msm_set_pinctrl(pinctrl_info, STATE_DISABLE); ret_pinctrl = msm_set_pinctrl(pinctrl_info, STATE_DISABLE);
if (ret) if (ret_pinctrl)
pr_err("%s: MI2S TLMM pinctrl set failed with %d\n", pr_err("%s: MI2S TLMM pinctrl set failed with %d\n",
__func__, ret); __func__, ret_pinctrl);
} }
} }