ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
PATCH 1/1 ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
The commit 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()") added NULL checks in create_yamaha_midi_quirk(), but there was an overlook. The code allows one of either injd or outjd is NULL, but the second if check made returning -ENODEV if any of them is NULL. Fix it in a proper form.
--- sound/usb/quirks.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/usb/quirks.c +2 -2
@@ -248,8 +248,8 @@ static int create_yamaha_midi_quirk(struct snd_usb_audio *chip, NULL, USB_MS_MIDI_OUT_JACK);if (!injd && !outjd)return -ENODEV ; -if (!(injd &&snd_usb_validate_midi_desc (injd)) || - !(outjd &&snd_usb_validate_midi_desc (outjd))) +if ((injd && !snd_usb_validate_midi_desc (injd)) || + (outjd && !snd_usb_validate_midi_desc (outjd)))return -ENODEV ; if (injd && (injd->bLength < 5 || (injd->bJackType != USB_MS_EMBEDDED &&
Signature · 1 line
2.16.4
Quoted 11 lines · Takashi Iwai
The commit
60849562a5db("ALSA: usb-audio: Fix possible NULL dereference atcreate_yamaha_midi_quirk()") added NULL checks increate_yamaha_midi_quirk(), but there was an overlook. The code allows one of either injd or outjd is NULL, but the second if check made returning-ENODEVif any of them is NULL. Fix it in a proper form.Fixes 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()")Reported-by Pavel Machek <[email protected]>Cc <[email protected]>Signed-off-by Takashi Iwai <[email protected]>
Thanks for doing this.
Pavel
Signature · 2 lines
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany