@@ -1146,6 +1146,10 @@ int snd_pcm_hw_rule_add(struct snd_pcm_runtime *runtime, unsigned int cond,
struct snd_pcm_hw_rule *c;
unsigned int k;
va_list args;
+
+ if (!hw_is_mask(var) && !hw_is_interval(var))
+ return -EINVAL;
+
va_start(args, dep);
if (constrs->rules_num >= constrs->rules_all) {
struct snd_pcm_hw_rule *new;
@@ -1448,10 +1452,11 @@ int snd_pcm_hw_constraint_msbits(struct snd_pcm_runtime *runtime,
unsigned int msbits)
{
unsigned long l = (msbits << 16) | width;
- return snd_pcm_hw_rule_add(runtime, cond, -1,
- snd_pcm_hw_rule_msbits,
- (void*) l,
- SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
+ return snd_pcm_hw_rule_add(runtime, cond,
+ SNDRV_PCM_HW_PARAM_SAMPLE_BITS,
+ snd_pcm_hw_rule_msbits,
+ (void *) l,
+ SNDRV_PCM_HW_PARAM_SAMPLE_BITS, -1);
}
EXPORT_SYMBOL(snd_pcm_hw_constraint_msbits);
@@ -438,7 +438,7 @@ static int constrain_params_by_rules(struct snd_pcm_substream *substream,
* in user space by returned bits, then preparing for next
* iteration.
*/
- if (changed && r->var >= 0) {
+ if (changed) {
params->cmask |= (1 << r->var);
vstamps[r->var] = stamp;
again = true;
Drivers can register rule of PCM parameters by a call of snd_pcm_hw_rule_add(). The rule includes a target parameter and dependent parameters. Basically, these parameters are the ones classified as mask or interval type. Although the helper function should check the variables, it actually doesn't. This brings extra check in rule application. This commit adds argument checker to the helper function. Unfortunately, snd_pcm_hw_constraint_msbits() pass -1 as its parameter type. This is because it's for non-mask/non-interval parameter. However, similar helper functions, i.e. snd_pcm_hw_constraint_ratdens(), uses the same value for target/dependent parameter. We can use SNDRV_PCM_HW_PARAM_SAMPLE_BITS for the parameter. Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp> --- sound/core/pcm_lib.c | 13 +++++++++---- sound/core/pcm_native.c | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-)