diff options
| author | Takashi Iwai <tiwai@suse.de> | 2019-08-20 18:17:09 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-11-12 21:20:48 +0300 |
| commit | 17821e2fb16752f5d363fb5c3f8aab4df41b9bcc (patch) | |
| tree | 9651161eda539472f4f109aff8d4fb17c8adac17 /sound/usb/helper.h | |
| parent | 5e36cf8edb5812e378b57511263d1a0a9172eeb9 (diff) | |
| download | linux-17821e2fb16752f5d363fb5c3f8aab4df41b9bcc.tar.xz | |
ALSA: usb-audio: More validations of descriptor units
commit 57f8770620e9b51c61089751f0b5ad3dbe376ff2 upstream.
Introduce a new helper to validate each audio descriptor unit before
and check the unit before actually accessing it. This should harden
against the OOB access cases with malformed descriptors that have been
recently frequently reported by fuzzers.
The existing descriptor checks are still kept although they become
superfluous after this patch. They'll be cleaned up eventually
later.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'sound/usb/helper.h')
| -rw-r--r-- | sound/usb/helper.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/usb/helper.h b/sound/usb/helper.h index d338bd0e0ca6..f5b4c6647e4d 100644 --- a/sound/usb/helper.h +++ b/sound/usb/helper.h @@ -30,4 +30,8 @@ static inline int snd_usb_ctrl_intf(struct snd_usb_audio *chip) return get_iface_desc(chip->ctrl_intf)->bInterfaceNumber; } +/* in validate.c */ +bool snd_usb_validate_audio_desc(void *p, int protocol); +bool snd_usb_validate_midi_desc(void *p); + #endif /* __USBAUDIO_HELPER_H */ |