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

ASoC: msm: qdsp6v2: Handle invalid session for dtmf enable

Browse source 
If session id is invalid then dtmf voice info will also
be invalid.

Add check to return error if session id is invalid.

CRs-Fixed: 2306771
Change-Id: I362340f9f666c95949eaa94d0ced4cb3a1b9abab
Signed-off-by: Soumya Managoli <smanag@codeaurora.org>
This commit is contained in:
Soumya Managoli 2018-09-06 15:55:58 +05:30 • committed by Gerrit - the friendly Code Review server
parent e106251f0f
commit c29b12e26d
1 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
sound/soc/msm/qdsp6v2/msm-pcm-voice-v2.c
View file

@ -60,6 +60,28 @@ static struct snd_pcm_hardware msm_pcm_hardware = {
.fifo_size = 0, .fifo_size = 0,
}; };
static int is_valid_session_id(uint32_t session_id)
{
int idx = 0;
switch (session_id) {
case VOICE_SESSION_VSID:
case VOICE2_SESSION_VSID:
case VOLTE_SESSION_VSID:
case QCHAT_SESSION_VSID:
case VOWLAN_SESSION_VSID:
case VOICEMMODE1_VSID:
case VOICEMMODE2_VSID:
case ALL_SESSION_VSID:
idx = 1;
break;
default:
pr_debug("%s: Invalid session_id : %x\n", __func__, session_id);
break;
}
return idx;
}
static int get_idx_for_session(uint32_t session_id) static int get_idx_for_session(uint32_t session_id)
{ {
int idx = 0; int idx = 0;
@ -684,6 +706,11 @@ static int msm_dtmf_detect_rx_vsid_cb_put(struct snd_kcontrol *kcontrol,
uint32_t session_id = ucontrol->value.integer.value[0]; uint32_t session_id = ucontrol->value.integer.value[0];
uint32_t enable = ucontrol->value.integer.value[1]; uint32_t enable = ucontrol->value.integer.value[1];
if (!is_valid_session_id(session_id)) {
pr_err(" %s Invalid session_id : %x\n", __func__, session_id);
return -EINVAL;
}
if (enable) if (enable)
enable = 1; enable = 1;