Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 89b89d12 authored by Jaejoong Kim's avatar Jaejoong Kim Committed by Takashi Iwai
Browse files

ALSA: usb-audio: Add check return value for usb_string() 



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: default avatarJaejoong Kim <climbbb.kim@gmail.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 251552a2

sound/usb/mixer.c

+5 −4
Original line number Diff line number Diff line
@@ -2178,12 +2178,13 @@ 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)



	if (!len) {

		strlcpy(kctl->id.name, "USB", sizeof(kctl->id.name));



		if (desc->bDescriptorSubtype == UAC2_CLOCK_SELECTOR)