diff options
author | Takashi Iwai <tiwai@suse.de> | 2019-11-13 12:12:59 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-20 18:45:13 +0100 |
commit | 420433f6cf5c6505433a6324584bebb219599806 (patch) | |
tree | 02928e1d8a69ddd8a78f382d4fd7a748ba506649 /sound | |
parent | ab2ee4299b7e2ae441d6b539ff846413d6b85d29 (diff) | |
download | linux-stable-420433f6cf5c6505433a6324584bebb219599806.tar.gz linux-stable-420433f6cf5c6505433a6324584bebb219599806.tar.bz2 linux-stable-420433f6cf5c6505433a6324584bebb219599806.zip |
ALSA: usb-audio: Fix incorrect NULL check in create_yamaha_midi_quirk()
commit cc9dbfa9707868fb0ca864c05e0c42d3f4d15cf2 upstream.
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.
Fixes: 60849562a5db ("ALSA: usb-audio: Fix possible NULL dereference at create_yamaha_midi_quirk()")
Reported-by: Pavel Machek <pavel@denx.de>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20191113111259.24123-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/quirks.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index ea253c97b8b9..052b4ada2d05 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c @@ -259,8 +259,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 && |