linux-kernel - [PATCH] usbcore: Select only first configuration for non-UAC3 compliant devices

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:   Sat,  5 Jan 2019 19:32:37 +0530
From:   saranya.gopal@...el.com
To:     kernel@...ivas.org
Cc:     pierre-louis.bossart@...ux.intel.com, alsa-devel@...a-project.org,
        linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
        tiwai@...e.de, felipe.balbi@...ux.intel.com,
        Saranya Gopal <saranya.gopal@...el.com>
Subject: [PATCH] usbcore: Select only first configuration for non-UAC3 compliant devices

From: Saranya Gopal <saranya.gopal@...el.com>

In most of the UAC1 and UAC2 audio devices, the first
configuration is most often the best configuration.
However, with recent patch to support UAC3 configuration,
second configuration was unintentionally chosen for
some of the UAC1/2 devices that had more than one
configuration. This was because of the existing check
after the audio config check which selected any config
which had a non-vendor class. This patch fixes this issue.

Fixes: f13912d (Select UAC3 configuration for audio if present)
Reported-by: Con Kolivas <kernel@...ivas.org>
Signed-off-by: Saranya Gopal <saranya.gopal@...el.com>
---
 drivers/usb/core/generic.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/core/generic.c b/drivers/usb/core/generic.c
index 356b05c..f713cec 100644
--- a/drivers/usb/core/generic.c
+++ b/drivers/usb/core/generic.c
@@ -143,9 +143,12 @@ int usb_choose_configuration(struct usb_device *udev)
 			continue;
 		}
 
-		if (i > 0 && desc && is_audio(desc) && is_uac3_config(desc)) {
-			best = c;
-			break;
+		if (i > 0 && desc && is_audio(desc)) {
+			if (is_uac3_config(desc)) {
+				best = c;
+				break;
+			}
+			continue;
 		}
 
 		/* From the remaining configs, choose the first one whose
-- 
1.9.1