mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-02 23:27:06 +00:00
Code Issues Releases Wiki Activity

ALSA: pcm: Remove VLA usage

Browse source 
A helper function used by snd_pcm_hw_refine() still keeps using VLA
for timestamps of hw constraint rules that are non-fixed size.

Let's replace the VLA with a simple kmalloc() array.

Reference: https://lkml.org/lkml/2018/3/7/621
Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2018-03-13 11:18:57 +01:00
parent 491f833134
commit 5730f9f744
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
sound/core/pcm_native.c
View file

@ -323,7 +323,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
struct snd_pcm_hw_constraints *constrs = struct snd_pcm_hw_constraints *constrs =
&substream->runtime->hw_constraints; &substream->runtime->hw_constraints;
unsigned int k; unsigned int k;
unsigned int rstamps[constrs->rules_num]; unsigned int *rstamps;
unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1]; unsigned int vstamps[SNDRV_PCM_HW_PARAM_LAST_INTERVAL + 1];
unsigned int stamp; unsigned int stamp;
struct snd_pcm_hw_rule *r; struct snd_pcm_hw_rule *r;
@ -331,7 +331,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
struct snd_mask old_mask; struct snd_mask old_mask;
struct snd_interval old_interval; struct snd_interval old_interval;
bool again; bool again;
int changed; int changed, err = 0;
/* /*
* Each application of rule has own sequence number. * Each application of rule has own sequence number.
@ -339,8 +339,9 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
* Each member of 'rstamps' array represents the sequence number of * Each member of 'rstamps' array represents the sequence number of
* recent application of corresponding rule. * recent application of corresponding rule.
*/ */
for (k = 0; k < constrs->rules_num; k++) rstamps = kcalloc(constrs->rules_num, sizeof(unsigned int), GFP_KERNEL);
rstamps[k] = 0; if (!rstamps)
return -ENOMEM;
/* /*
* Each member of 'vstamps' array represents the sequence number of * Each member of 'vstamps' array represents the sequence number of
@ -398,8 +399,10 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
} }
changed = r->func(params, r); changed = r->func(params, r);
if (changed < 0) if (changed < 0) {
return changed; err = changed;
goto out;
}
/* /*
* When the parameter is changed, notify it to the caller * When the parameter is changed, notify it to the caller
@ -430,7 +433,9 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
if (again) if (again)
goto retry; goto retry;
return 0; out:
kfree(rstamps);
return err;
} }
static int fixup_unreferenced_params(struct snd_pcm_substream *substream, static int fixup_unreferenced_params(struct snd_pcm_substream *substream,