diff options
| author | Jaejoong Kim <climbbb.kim@gmail.com> | 2017-12-04 15:31:49 +0900 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:51:43 +0000 |
| commit | 6b7ee440f351ccd37b62ba0ae01a29c63adf2db3 (patch) | |
| tree | d1b04c566100cf8cf91aa29004c6d563310b27ba /sound/usb | |
| parent | f2e49dfd37188d92f74d16ee063e2f19dbedad22 (diff) | |
ALSA: usb-audio: Add check return value for usb_string()
commit 89b89d121ffcf8d9546633b98ded9d18b8f75891 upstream.
snd_usb_copy_string_desc() returns zero if usb_string() fails.
In case of failure, we need to check the snd_usb_copy_string_desc()'s
return value and add an exception case
Signed-off-by: Jaejoong Kim <climbbb.kim@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/mixer.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c index b7b9e59f7a0f..9c1d4f0e0f4b 100644 --- a/sound/usb/mixer.c +++ b/sound/usb/mixer.c @@ -2100,13 +2100,14 @@ static int parse_audio_selector_unit(struct mixer_build *state, int unitid, if (len) ; else if (nameid) - snd_usb_copy_string_desc(state, nameid, kctl->id.name, + len = snd_usb_copy_string_desc(state, nameid, kctl->id.name, sizeof(kctl->id.name)); - else { + else len = get_term_name(state, &state->oterm, kctl->id.name, sizeof(kctl->id.name), 0); - if (!len) - strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name)); + + if (!len) { + strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name)); if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR) append_ctl_name(kctl, " Clock Source"); |