Fix a stack buffer overflow bug in check_input_term
Subsystems (2)
PATCH 2/2 Fix a stack buffer overflow bug in check_input_term
check_input_term recursively calls itself with input from device side (e.g., uac_input_terminal_descriptor.bCSourceID) as argument (id). In check_input_term, if check_input_term is called with the same id argument as the caller, it triggers endless recursive call, resulting kernel space stack overflow.
This patch fixes the bug by adding a bitmap to struct mixer_build to keep track of the checked ids and stop the execution if some id has been checked (similar to how parse_audio_unit handles unitid argument).
CVE: CVE-2018-15118
--- sound/usb/mixer.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
sound/usb/mixer.c +24 -5
@@ -81,6 +81,7 @@ struct mixer_build {unsigned char *buffer;unsigned int buflen;DECLARE_BITMAP (unitbitmap,MAX_ID_ELEMS ); +DECLARE_BITMAP (termbitmap,MAX_ID_ELEMS );struct usb_audio_term oterm;const struct usbmix_name_map *map;const struct usbmix_selector_map *selector_map;
@@ -709,15 +710,24 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm* parse the source unit recursively until it reaches to a terminal * or a branched unit. */ -static int check_input_term (struct mixer_build *state,int id, +static int __check_input_term (struct mixer_build *state,int id,struct usb_audio_term *term) {int err;void *p1; +unsigned char *hdr;memset (term,0 ,sizeof (*term)); -while ((p1 =find_audio_control_unit (state, id)) !=NULL ) { -unsigned char *hdr = p1; +for (;;) { +/* a loop in the terminal chain? */ +if (test_and_set_bit (id, state->termbitmap)) +return -EINVAL ; + + p1 =find_audio_control_unit (state, id); +if (!p1) +break ; + + hdr = p1; term->id = id;switch (hdr[2 ]) {case UAC_INPUT_TERMINAL :
@@ -732,7 +742,7 @@ static int check_input_term(struct mixer_build *state, int id,/* call recursively to verify that the * referenced clock entity is valid */ - err =check_input_term (state, d->bCSourceID, term); + err =__check_input_term (state, d->bCSourceID, term);if (err <0 )return err;
@@ -764,7 +774,7 @@ static int check_input_term(struct mixer_build *state, int id,case UAC2_CLOCK_SELECTOR : {struct uac_selector_unit_descriptor *d = p1;/* call recursively to retrieve the channel info */ - err =check_input_term (state, d->baSourceID[0 ], term); + err =__check_input_term (state, d->baSourceID[0 ], term);if (err <0 )return err; term->type = d->bDescriptorSubtype <<16 ;/* virtual type */
@@ -811,6 +821,15 @@ static int check_input_term(struct mixer_build *state, int id,return -ENODEV ; } + +static int check_input_term (struct mixer_build *state,int id, +struct usb_audio_term *term) +{ +memset (term,0 ,sizeof (*term)); +memset (state->termbitmap,0 ,sizeof (state->termbitmap)); +return __check_input_term (state, id, term); +} +/* * Feature Unit */
Signature · 1 line
2.17.1
This is the backported patch for the following fix to v4.4.x and v4.14.x:19bce474c45b ("ALSA: usb-audio: Fix a stack buffer overflow bug in check_input_term")
Quoted 107 lines · Hui Peng
check_input_termrecursively calls itself with input from device side (e.g., uac_input_terminal_descriptor.bCSourceID) as argument (id). Incheck_input_term, ifcheck_input_termis called with the sameidargument as the caller, it triggers endless recursive call, resulting kernel space stack overflow.This patch fixes the bug by adding a bitmap to
struct mixer_buildto keep track of the checked ids and stop the execution if some id has been checked (similar to howparse_audio_unithandles unitid argument).CVE: CVE-2018-15118
Reported-by Hui Peng <[email protected]>Reported-by Mathias Payer <[email protected]>Signed-off-by Hui Peng <[email protected]>--- sound/usb/mixer.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)sound/usb/mixer.c +1
-0@@ -81,6 +81,7 @@ struct mixer_build {unsigned char *buffer;unsigned int buflen;DECLARE_BITMAP (unitbitmap,MAX_ID_ELEMS ); +DECLARE_BITMAP (termbitmap,MAX_ID_ELEMS );struct usb_audio_term oterm;const struct usbmix_name_map *map;const struct usbmix_selector_map *selector_map;@@ -709,15 +710,24 @@ static int get_term_name(struct mixer_build *state,struct
usb_audio_term*iterm
* parse the source unit recursively until it reaches to a terminal
* or a branched unit.
*/sound/usb/mixer.c +13
-4-static int check_input_term (struct mixer_build *state,int id, +static int __check_input_term (struct mixer_build *state,int id,struct usb_audio_term *term) {int err;void *p1; +unsigned char *hdr;memset (term,0 ,sizeof (*term)); -while ((p1 =find_audio_control_unit (state, id)) !=NULL ) { -unsigned char *hdr = p1; +for (;;) { +/* a loop in the terminal chain? */ +if (test_and_set_bit (id, state->termbitmap)) +return -EINVAL ; + + p1 =find_audio_control_unit (state, id); +if (!p1) +break ; + + hdr = p1; term->id = id;switch (hdr[2 ]) {case UAC_INPUT_TERMINAL :@@ -732,7 +742,7 @@ static int check_input_term(struct mixer_build *state,int id,/* call recursively to verify that the * referenced clock entity is valid */ - err =check_input_term (state, d->bCSourceID, term); + err =__check_input_term (state, d->bCSourceID, term);if (err < 0) return err;sound/usb/mixer.c +1
-1@@ -764,7 +774,7 @@ static int check_input_term(struct mixer_build *state, int id, case UAC2_CLOCK_SELECTOR: {struct uac_selector_unit_descriptor *d = p1;/* call recursively to retrieve the channel info */ - err =check_input_term (state, d->baSourceID[0 ], term); + err =__check_input_term (state, d->baSourceID[0 ], term);if (err < 0) return err; term->type = d->bDescriptorSubtype << 16; /*virtual type */
sound/usb/mixer.c +9
-0@@ -811,6 +821,15 @@ static int check_input_term(struct mixer_build *state, int id, return -ENODEV ; } + +static int check_input_term (struct mixer_build *state,int id, +struct usb_audio_term *term) +{ +memset (term,0 ,sizeof (*term)); +memset (state->termbitmap,0 ,sizeof (state->termbitmap)); +return __check_input_term (state, id, term); +} +/* * Feature Unit */
--
2.17.1
Greg Kroah-Hartman
maintainerQuoted 3 lines · Hui Peng
This is the backported patch for the following fix to v4.4.x and v4.14.x:
19bce474c45b("ALSA: usb-audio: Fix a stack buffer overflow bug incheck_input_term")
Now queued up, thanks.
greg k-h
Hi Hui,
Quoted 6 lines · Hui Peng
check_input_termrecursively calls itself with input from device side (e.g., uac_input_terminal_descriptor.bCSourceID) as argument (id). Incheck_input_term, ifcheck_input_termis called with the sameidargument as the caller, it triggers endless recursive call, resulting kernel space stack overflow.
Quoted 6 lines
This patch fixes the bug by adding a bitmap to
struct mixer_buildto keep track of the checked ids and stop the execution if some id has been checked (similar to howparse_audio_unithandles unitid argument).CVE: CVE-2018-15118
Similar to the previous one, this should be CVE-2019-15118 as far I can tell.
Regards,
Salvatore
Quoted 9 lines · Salvatore Bonaccorso
Hi Hui,
Quoted 6 lines · Hui Peng
check_input_termrecursively calls itself with input from device side (e.g., uac_input_terminal_descriptor.bCSourceID) as argument (id). Incheck_input_term, ifcheck_input_termis called with the sameidargument as the caller, it triggers endless recursive call, resulting kernel space stack overflow.
Quoted 8 lines
Quoted 6 lines
This patch fixes the bug by adding a bitmap to
struct mixer_buildto keep track of the checked ids and stop the execution if some id has been checked (similar to howparse_audio_unithandles unitid argument).CVE: CVE-2018-15118
Similar to the previous one, this should be CVE-2019-15118 as far I can tell.
Same here: CVE id updated.
Can you apply it to v4.4.190 and v4.14.141?
Thanks.
Quoted 4 lines
Regards,
Salvatore
Fromf5e478c4807b16f49c00316fb80485562b84340aMon Sep 17 00:00:00 2001
From: Hui Peng <[email protected]>
Date: Fri, 30 Aug 2019 16:20:41 -0400
Subject: [PATCH 2/2] Fix a stack buffer overflow bug in check_input_term
check_input_term recursively calls itself with input from device side (e.g., uac_input_terminal_descriptor.bCSourceID) as argument (id). In check_input_term, if check_input_term is called with the same id argument as the caller, it triggers endless recursive call, resulting kernel space stack overflow.
This patch fixes the bug by adding a bitmap to struct mixer_build to keep track of the checked ids and stop the execution if some id has been checked (similar to how parse_audio_unit handles unitid argument).
CVE: CVE-2019-15118
--- sound/usb/mixer.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-)
sound/usb/mixer.c +24 -5
@@ -81,6 +81,7 @@ struct mixer_build {unsigned char *buffer;unsigned int buflen;DECLARE_BITMAP (unitbitmap,MAX_ID_ELEMS ); +DECLARE_BITMAP (termbitmap,MAX_ID_ELEMS );struct usb_audio_term oterm;const struct usbmix_name_map *map;const struct usbmix_selector_map *selector_map;
@@ -709,15 +710,24 @@ static int get_term_name(struct mixer_build *state, struct usb_audio_term *iterm* parse the source unit recursively until it reaches to a terminal * or a branched unit. */ -static int check_input_term (struct mixer_build *state,int id, +static int __check_input_term (struct mixer_build *state,int id,struct usb_audio_term *term) {int err;void *p1; +unsigned char *hdr;memset (term,0 ,sizeof (*term)); -while ((p1 =find_audio_control_unit (state, id)) !=NULL ) { -unsigned char *hdr = p1; +for (;;) { +/* a loop in the terminal chain? */ +if (test_and_set_bit (id, state->termbitmap)) +return -EINVAL ; + + p1 =find_audio_control_unit (state, id); +if (!p1) +break ; + + hdr = p1; term->id = id;switch (hdr[2 ]) {case UAC_INPUT_TERMINAL :
@@ -732,7 +742,7 @@ static int check_input_term(struct mixer_build *state, int id,/* call recursively to verify that the * referenced clock entity is valid */ - err =check_input_term (state, d->bCSourceID, term); + err =__check_input_term (state, d->bCSourceID, term);if (err <0 )return err;
@@ -764,7 +774,7 @@ static int check_input_term(struct mixer_build *state, int id,case UAC2_CLOCK_SELECTOR : {struct uac_selector_unit_descriptor *d = p1;/* call recursively to retrieve the channel info */ - err =check_input_term (state, d->baSourceID[0 ], term); + err =__check_input_term (state, d->baSourceID[0 ], term);if (err <0 )return err; term->type = d->bDescriptorSubtype <<16 ;/* virtual type */
@@ -811,6 +821,15 @@ static int check_input_term(struct mixer_build *state, int id,return -ENODEV ; } + +static int check_input_term (struct mixer_build *state,int id, +struct usb_audio_term *term) +{ +memset (term,0 ,sizeof (*term)); +memset (state->termbitmap,0 ,sizeof (state->termbitmap)); +return __check_input_term (state, id, term); +} +/* * Feature Unit */
Signature · 1 line
2.17.1