Commit 46cadda8 authored by Juergen Kreileder's avatar Juergen Kreileder Committed by Chris Wright

[PATCH] Fix snd-usb-audio in 32-bit compat environment

I'm getting oopses with snd-usb-audio in 32-bit compat environments:
control_compat.c:get_ctl_type() doesn't initialize 'info', so
'itemlist[uinfo->value.enumerated.item]' in
usbmixer.c:mixer_ctl_selector_info() might access random memory (The 'if
((int)uinfo->value.enumerated.item >= cval->max)' doesn't fix all problems
because of the unsigned -> signed conversion.)
Signed-off-by: default avatarJuergen Kreileder <jk@blackdown.de>
Cc: Jaroslav Kysela <perex@suse.cz>
Acked-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarChris Wright <chrisw@sous-sol.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent fd01ab8d
...@@ -164,7 +164,7 @@ struct sndrv_ctl_elem_value32 { ...@@ -164,7 +164,7 @@ struct sndrv_ctl_elem_value32 {
static int get_ctl_type(snd_card_t *card, snd_ctl_elem_id_t *id, int *countp) static int get_ctl_type(snd_card_t *card, snd_ctl_elem_id_t *id, int *countp)
{ {
snd_kcontrol_t *kctl; snd_kcontrol_t *kctl;
snd_ctl_elem_info_t info; snd_ctl_elem_info_t *info;
int err; int err;
down_read(&card->controls_rwsem); down_read(&card->controls_rwsem);
...@@ -173,13 +173,19 @@ static int get_ctl_type(snd_card_t *card, snd_ctl_elem_id_t *id, int *countp) ...@@ -173,13 +173,19 @@ static int get_ctl_type(snd_card_t *card, snd_ctl_elem_id_t *id, int *countp)
up_read(&card->controls_rwsem); up_read(&card->controls_rwsem);
return -ENXIO; return -ENXIO;
} }
info.id = *id; info = kzalloc(sizeof(*info), GFP_KERNEL);
err = kctl->info(kctl, &info); if (info == NULL) {
up_read(&card->controls_rwsem);
return -ENOMEM;
}
info->id = *id;
err = kctl->info(kctl, info);
up_read(&card->controls_rwsem); up_read(&card->controls_rwsem);
if (err >= 0) { if (err >= 0) {
err = info.type; err = info->type;
*countp = info.count; *countp = info->count;
} }
kfree(info);
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment