Re: [PATCH] staging: speakup: kobjects.c: Use correct values whenchanging voice.

[Samuel Thibault]

Christopher Brannon, le Wed 11 Sep 2013 10:05:27 -0700, a écrit :
> When a new voice is selected, we set volume and pitch appropriate for
> the voice.  We need to use the numeric index corresponding to the
> voice when indexing into the volume and pitch tables, rather than
> the raw user input that was used to select the voice.
> Note that using the raw input can also lead to an invalid memory read
> in the case of invalid or malicious user input.
> 
> Signed-off-by: Christopher Brannon <chris@xxxxxxxxxxxxxxxx>

Acked-by: Samuel Thibault <samuel.thibault@xxxxxxxxxxxx>

> ---
>  drivers/staging/speakup/kobjects.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/speakup/kobjects.c b/drivers/staging/speakup/kobjects.c
> index 61a3f7a..f31afa2 100644
> --- a/drivers/staging/speakup/kobjects.c
> +++ b/drivers/staging/speakup/kobjects.c
> @@ -651,7 +651,10 @@ ssize_t spk_var_store(struct kobject *kobj, struct kobj_attribute *attr,
>  		* If voice was just changed, we might need to reset our default
>  		* pitch and volume.
>  		*/
> -		if (param->var_id == VOICE) {
> +		if (param->var_id == VOICE && synth &&
> +		    (ret == 0 || ret == -ERESTART)) {
> +			var_data = param->data;
> +			value = var_data->u.n.value;
>  			spk_reset_default_value("pitch", synth->default_pitch,
>  				value);
>  			spk_reset_default_value("vol", synth->default_vol,
> -- 
> 1.8.1.5
> 

-- 
Samuel
Hi ! I'm a .signature virus ! Copy me into your ~/.signature, please !
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/