From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F694C43457 for ; Sun, 18 Oct 2020 19:32:09 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 46FC5207DE for ; Sun, 18 Oct 2020 19:32:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049529; bh=Jg8VYre6EXuZXTV3oHLDBy04t8AZqpUOPB3jyiDGBEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IF0hxVk5tBYf9iIRlW/FrKZsGmTT2bAwn1CdigqXtk1FAIfhW5ekbz1aJLk9qyXku oh9CD6qGylUj10ydN4aFVCq/m0PRaGeCLyzDsU3laG9Pchwb/e6U6cwaZ//87zl++y ex+cPoYpAM8/A4Pyoj9YyzK/2nPUqQARKrWYxmw4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732429AbgJRTcI (ORCPT ); Sun, 18 Oct 2020 15:32:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:42704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730965AbgJRT1H (ORCPT ); Sun, 18 Oct 2020 15:27:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CB1E2137B; Sun, 18 Oct 2020 19:27:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603049226; bh=Jg8VYre6EXuZXTV3oHLDBy04t8AZqpUOPB3jyiDGBEk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zxc1OQzYQYibhYLXOJkLD3/9y48Hj11ve1aJKcRO9xPOoNmce1QiENdHTagQ7t1Fs rbaoWvXV2IucF/HC65MDu/ZFmSHEqlK0x7QtCJyKNfcqIsC8JtxE+j2R09aO+Og4Q/ MxWFZg4/+qgyuujISC/cjyRhPSVMsDOOTtTHFG+E= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hovold , Daniel Caujolle-Bert , Oliver Neukum , Greg Kroah-Hartman , Sasha Levin , linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 25/41] USB: cdc-acm: handle broken union descriptors Date: Sun, 18 Oct 2020 15:26:19 -0400 Message-Id: <20201018192635.4056198-25-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201018192635.4056198-1-sashal@kernel.org> References: <20201018192635.4056198-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johan Hovold [ Upstream commit 960c7339de27c6d6fec13b54880501c3576bb08d ] Handle broken union functional descriptors where the master-interface doesn't exist or where its class is of neither Communication or Data type (as required by the specification) by falling back to "combined-interface" probing. Note that this still allows for handling union descriptors with switched interfaces. This specifically makes the Whistler radio scanners TRX series devices work with the driver without adding further quirks to the device-id table. Reported-by: Daniel Caujolle-Bert Tested-by: Daniel Caujolle-Bert Acked-by: Oliver Neukum Signed-off-by: Johan Hovold Link: https://lore.kernel.org/r/20200921135951.24045-3-johan@kernel.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/class/cdc-acm.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 2dc563b61b88a..d46f683beccdd 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1178,9 +1178,21 @@ static int acm_probe(struct usb_interface *intf, } } } else { + int class = -1; + data_intf_num = union_header->bSlaveInterface0; control_interface = usb_ifnum_to_if(usb_dev, union_header->bMasterInterface0); data_interface = usb_ifnum_to_if(usb_dev, data_intf_num); + + if (control_interface) + class = control_interface->cur_altsetting->desc.bInterfaceClass; + + if (class != USB_CLASS_COMM && class != USB_CLASS_CDC_DATA) { + dev_dbg(&intf->dev, "Broken union descriptor, assuming single interface\n"); + combined_interfaces = 1; + control_interface = data_interface = intf; + goto look_for_collapsed_interface; + } } if (!control_interface || !data_interface) { -- 2.25.1