OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ALSA: snd-usb-caiaq: Fix NULL dereference in input.c 

There was a case where a newly-registered input device could be opened before
a necessary variable in the device structure was set. When code tried to use
the variable in the URB reply callback, it would cause an Oops.

This fix sets the aforementioned variable before calling input_register_device.

Signed-off-by: William Light <wrl@illest.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
William Light 2011-10-10 15:54:22 +00:00 committed by Takashi Iwai
parent ffd3d5c6c7
commit 3d37fbe441
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sound/usb/caiaq/input.c
View File

@ -664,15 +664,17 @@ int snd_usb_caiaq_input_init(struct snd_usb_caiaqdev *dev)
for (i = 0; i < input->keycodemax; i++)
__set_bit(dev->keycode[i], input->keybit);
dev->input_dev = input;
ret = input_register_device(input);
if (ret < 0)
goto exit_free_idev;
dev->input_dev = input;
return 0;
exit_free_idev:
input_free_device(input);
dev->input_dev = NULL;
return ret;
}