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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 1BE31C33C9E for ; Sat, 11 Jan 2020 10:34:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DAB54214D8 for ; Sat, 11 Jan 2020 10:34:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738844; bh=VdA8x5GJQUpm6U1ydO98WlhWqQKCLKaoQCa5iaUupi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kKhaUWUqFDIR8P8alK/xoV0xeWtys/mAft4J9J/VET/KeHuXNWVACuw2OnP33bXoy nIgrTL4SsuMdJI5GgAH4JTX002j/7NT/IL0ogd2tCUIla2WOcS6StlqRRP/AIJHIqG L/aC37J/UEEUl4Mrg7IfdNV1njVGES+WwfKycEqo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731539AbgAKKeD (ORCPT ); Sat, 11 Jan 2020 05:34:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:49434 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731532AbgAKKd6 (ORCPT ); Sat, 11 Jan 2020 05:33:58 -0500 Received: from localhost (unknown [62.119.166.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DFA3920678; Sat, 11 Jan 2020 10:33:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738837; bh=VdA8x5GJQUpm6U1ydO98WlhWqQKCLKaoQCa5iaUupi4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MrHNecXbRY1muN6MEubbfZtAyUrIZP7b3zUpwrJRXNt0+OqtrAxxrBIwsy32Wky4/ 3KFJ9KOzZuTgABSBVFwblT7KmOuIvcgXXJ9KgQmXko3XCyrG1gRPgZSTZdYn9CbAPd J99Uk6meSLUGBZTYOqlJVKLHFWuC4alMB8e4XKxg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alan Stern , Qi Zhou Subject: [PATCH 5.4 165/165] usb: missing parentheses in USE_NEW_SCHEME Date: Sat, 11 Jan 2020 10:51:24 +0100 Message-Id: <20200111094943.996593208@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qi Zhou commit 1530f6f5f5806b2abbf2a9276c0db313ae9a0e09 upstream. According to bd0e6c9614b9 ("usb: hub: try old enumeration scheme first for high speed devices") the kernel will try the old enumeration scheme first for high speed devices. This can happen when a high speed device is plugged in. But due to missing parentheses in the USE_NEW_SCHEME define, this logic can get messed up and the incorrect result happens. Acked-by: Alan Stern Signed-off-by: Qi Zhou Link: https://lore.kernel.org/r/ht4mtag8ZP-HKEhD0KkJhcFnVlOFV8N8eNjJVRD9pDkkLUNhmEo8_cL_sl7xy9mdajdH-T8J3TFQsjvoYQT61NFjQXy469Ed_BbBw_x4S1E=@protonmail.com [ fixup changelog text - gregkh] Cc: stable Fixes: bd0e6c9614b9 ("usb: hub: try old enumeration scheme first for high speed devices") Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/hub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -2691,7 +2691,7 @@ static unsigned hub_is_wusb(struct usb_h #define SET_ADDRESS_TRIES 2 #define GET_DESCRIPTOR_TRIES 2 #define SET_CONFIG_TRIES (2 * (use_both_schemes + 1)) -#define USE_NEW_SCHEME(i, scheme) ((i) / 2 == (int)scheme) +#define USE_NEW_SCHEME(i, scheme) ((i) / 2 == (int)(scheme)) #define HUB_ROOT_RESET_TIME 60 /* times are in msec */ #define HUB_SHORT_RESET_TIME 10