lkml.org 
[lkml]   [2020]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.5 051/367] ALSA: usb-audio: Fix endianess in descriptor validation
    Date
    From: Takashi Iwai <tiwai@suse.de>

    commit f8e5f90b3a53bb75f05124ed19156388379a337d upstream.

    I overlooked that some fields are words and need the converts from
    LE in the recently added USB descriptor validation code.
    This patch fixes those with the proper macro usages.

    Fixes: 57f8770620e9 ("ALSA: usb-audio: More validations of descriptor units")
    Cc: <stable@vger.kernel.org>
    Link: https://lore.kernel.org/r/20200201080530.22390-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    sound/usb/validate.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/sound/usb/validate.c
    +++ b/sound/usb/validate.c
    @@ -110,7 +110,7 @@ static bool validate_processing_unit(con
    default:
    if (v->type == UAC1_EXTENSION_UNIT)
    return true; /* OK */
    - switch (d->wProcessType) {
    + switch (le16_to_cpu(d->wProcessType)) {
    case UAC_PROCESS_UP_DOWNMIX:
    case UAC_PROCESS_DOLBY_PROLOGIC:
    if (d->bLength < len + 1) /* bNrModes */
    @@ -125,7 +125,7 @@ static bool validate_processing_unit(con
    case UAC_VERSION_2:
    if (v->type == UAC2_EXTENSION_UNIT_V2)
    return true; /* OK */
    - switch (d->wProcessType) {
    + switch (le16_to_cpu(d->wProcessType)) {
    case UAC2_PROCESS_UP_DOWNMIX:
    case UAC2_PROCESS_DOLBY_PROLOCIC: /* SiC! */
    if (d->bLength < len + 1) /* bNrModes */
    @@ -142,7 +142,7 @@ static bool validate_processing_unit(con
    len += 2; /* wClusterDescrID */
    break;
    }
    - switch (d->wProcessType) {
    + switch (le16_to_cpu(d->wProcessType)) {
    case UAC3_PROCESS_UP_DOWNMIX:
    if (d->bLength < len + 1) /* bNrModes */
    return false;

    \
     
     \ /
      Last update: 2020-02-10 14:08    [W:2.646 / U:0.848 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site