| From 53d15dc3c69cc23679244857dec38285c2589ed8 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Sat, 1 Feb 2020 09:05:28 +0100 |
| Subject: [PATCH] ALSA: usb-audio: Fix endianess in descriptor validation |
| |
| 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: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/sound/usb/validate.c b/sound/usb/validate.c |
| index fb6613883a1d..079f1713e6d1 100644 |
| --- a/sound/usb/validate.c |
| +++ b/sound/usb/validate.c |
| @@ -110,7 +110,7 @@ static bool validate_processing_unit(const void *p, |
| 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(const void *p, |
| 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(const void *p, |
| 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; |
| -- |
| 2.7.4 |
| |
