lkml.org 
[lkml]   [2017]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 055/164] ALSA: usb-audio: Add check return value for usb_string()
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Jaejoong Kim <climbbb.kim@gmail.com>

    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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/usb/mixer.c | 9 +++++----
    1 file changed, 5 insertions(+), 4 deletions(-)

    --- a/sound/usb/mixer.c
    +++ b/sound/usb/mixer.c
    @@ -2178,13 +2178,14 @@ static int parse_audio_selector_unit(str
    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");

    \
     
     \ /
      Last update: 2017-12-12 15:00    [W:4.092 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site