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=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham 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 9BA97C10F14 for ; Thu, 18 Apr 2019 18:26:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6E84120643 for ; Thu, 18 Apr 2019 18:26:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555611967; bh=pkzGvBQSwiZVsnJsH9MSTLUl6m8IndwiPjURJPXby3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pTmFWQdA2QjPSfzixdnNNyo/LKnpPyY2MhbTeJKW5UsV889UxTYlcmEt7VFZVdjov H04h3rmVJfdcrdel82OJA6nHbrcA5T11wQqH7NsTC7+03yU8EEwBpz+F+Aj9dXFxca 6jJ5QdCs63ZlWZNnWOiw4UOwa6CsSkWFSe3mCuB8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403782AbfDRSE5 (ORCPT ); Thu, 18 Apr 2019 14:04:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:34062 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391176AbfDRSEy (ORCPT ); Thu, 18 Apr 2019 14:04:54 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 455C2206B6; Thu, 18 Apr 2019 18:04:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555610693; bh=pkzGvBQSwiZVsnJsH9MSTLUl6m8IndwiPjURJPXby3I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zs/ZNnEs8un0EIJNLIm6fTB98ke+PG5DgxTn+IRQc3AvCr100Em0fTxzXWmOMj2Cm J1jfmQWLnDPMyTs6JazsU2uSte8WRYd0e0IC9Cl7VqiNBKitXDntvHUYYIR/vCGd0J 3Iayi4xKY2NdmBJY0aRUsT5MTNun9GNz6RljXzgo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Dieter , Valentina Manea , Shuah Khan , linux-usb@vger.kernel.org, =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Sasha Levin Subject: [PATCH 4.14 49/92] usbip: fix vhci_hcd controller counting Date: Thu, 18 Apr 2019 19:57:07 +0200 Message-Id: <20190418160434.377300492@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190418160430.325165109@linuxfoundation.org> References: <20190418160430.325165109@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 [ Upstream commit e0a2e73e501c77037c8756137e87b12c7c3c9793 ] Without this usbip fails on a machine with devices that lexicographically come after vhci_hcd. ie. $ ls -l /sys/devices/platform ... drwxr-xr-x. 4 root root 0 Sep 19 16:21 serial8250 -rw-r--r--. 1 root root 4096 Sep 19 23:50 uevent drwxr-xr-x. 6 root root 0 Sep 20 13:15 vhci_hcd.0 drwxr-xr-x. 4 root root 0 Sep 19 16:22 w83627hf.656 Because it detects 'w83627hf.656' as another vhci_hcd controller, and then fails to be able to talk to it. Note: this doesn't actually fix usbip's support for multiple controllers... that's still broken for other reasons ("vhci_hcd.0" is hardcoded in a string macro), but is enough to actually make it work on the above machine. See also: https://bugzilla.redhat.com/show_bug.cgi?id=1631148 Cc: Jonathan Dieter Cc: Valentina Manea Cc: Shuah Khan Cc: linux-usb@vger.kernel.org Signed-off-by: Maciej Żenczykowski Acked-by: Shuah Khan (Samsung OSG) Tested-by: Jonathan Dieter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- tools/usb/usbip/libsrc/vhci_driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/usb/usbip/libsrc/vhci_driver.c b/tools/usb/usbip/libsrc/vhci_driver.c index ed8c9d360c0f..4225d462701d 100644 --- a/tools/usb/usbip/libsrc/vhci_driver.c +++ b/tools/usb/usbip/libsrc/vhci_driver.c @@ -150,7 +150,7 @@ static int get_nports(struct udev_device *hc_device) static int vhci_hcd_filter(const struct dirent *dirent) { - return strcmp(dirent->d_name, "vhci_hcd") >= 0; + return !strncmp(dirent->d_name, "vhci_hcd.", 9); } static int get_ncontrollers(void) -- 2.19.1 From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [4.14,49/92] usbip: fix vhci_hcd controller counting From: Greg Kroah-Hartman Message-Id: <20190418160434.377300492@linuxfoundation.org> Date: Thu, 18 Apr 2019 19:57:07 +0200 To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jonathan Dieter , Valentina Manea , Shuah Khan , linux-usb@vger.kernel.org, =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Sasha Levin List-ID: WyBVcHN0cmVhbSBjb21taXQgZTBhMmU3M2U1MDFjNzcwMzdjODc1NjEzN2U4N2IxMmM3YzNjOTc5 MyBdCgpXaXRob3V0IHRoaXMgdXNiaXAgZmFpbHMgb24gYSBtYWNoaW5lIHdpdGggZGV2aWNlcwp0 aGF0IGxleGljb2dyYXBoaWNhbGx5IGNvbWUgYWZ0ZXIgdmhjaV9oY2QuCgppZS4KICAkIGxzIC1s IC9zeXMvZGV2aWNlcy9wbGF0Zm9ybQogIC4uLgogIGRyd3hyLXhyLXguIDQgcm9vdCByb290ICAg IDAgU2VwIDE5IDE2OjIxIHNlcmlhbDgyNTAKICAtcnctci0tci0tLiAxIHJvb3Qgcm9vdCA0MDk2 IFNlcCAxOSAyMzo1MCB1ZXZlbnQKICBkcnd4ci14ci14LiA2IHJvb3Qgcm9vdCAgICAwIFNlcCAy MCAxMzoxNSB2aGNpX2hjZC4wCiAgZHJ3eHIteHIteC4gNCByb290IHJvb3QgICAgMCBTZXAgMTkg MTY6MjIgdzgzNjI3aGYuNjU2CgpCZWNhdXNlIGl0IGRldGVjdHMgJ3c4MzYyN2hmLjY1NicgYXMg YW5vdGhlciB2aGNpX2hjZCBjb250cm9sbGVyLAphbmQgdGhlbiBmYWlscyB0byBiZSBhYmxlIHRv IHRhbGsgdG8gaXQuCgpOb3RlOiB0aGlzIGRvZXNuJ3QgYWN0dWFsbHkgZml4IHVzYmlwJ3Mgc3Vw cG9ydCBmb3IgbXVsdGlwbGUKY29udHJvbGxlcnMuLi4gdGhhdCdzIHN0aWxsIGJyb2tlbiBmb3Ig b3RoZXIgcmVhc29ucwooInZoY2lfaGNkLjAiIGlzIGhhcmRjb2RlZCBpbiBhIHN0cmluZyBtYWNy byksIGJ1dCBpcyBlbm91Z2ggdG8KYWN0dWFsbHkgbWFrZSBpdCB3b3JrIG9uIHRoZSBhYm92ZSBt YWNoaW5lLgoKU2VlIGFsc286CiAgaHR0cHM6Ly9idWd6aWxsYS5yZWRoYXQuY29tL3Nob3dfYnVn LmNnaT9pZD0xNjMxMTQ4CgpDYzogSm9uYXRoYW4gRGlldGVyIDxqZGlldGVyQGdtYWlsLmNvbT4K Q2M6IFZhbGVudGluYSBNYW5lYSA8dmFsZW50aW5hLm1hbmVhLm1AZ21haWwuY29tPgpDYzogU2h1 YWggS2hhbiA8c2h1YWhAa2VybmVsLm9yZz4KQ2M6IGxpbnV4LXVzYkB2Z2VyLmtlcm5lbC5vcmcK U2lnbmVkLW9mZi1ieTogTWFjaWVqIMW7ZW5jenlrb3dza2kgPHplbmN6eWtvd3NraUBnbWFpbC5j b20+CkFja2VkLWJ5OiBTaHVhaCBLaGFuIChTYW1zdW5nIE9TRykgPHNodWFoQGtlcm5lbC5vcmc+ ClRlc3RlZC1ieTogSm9uYXRoYW4gRGlldGVyIDxqZGlldGVyQGdtYWlsLmNvbT4KU2lnbmVkLW9m Zi1ieTogR3JlZyBLcm9haC1IYXJ0bWFuIDxncmVna2hAbGludXhmb3VuZGF0aW9uLm9yZz4KU2ln bmVkLW9mZi1ieTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIHRvb2xzL3Vz Yi91c2JpcC9saWJzcmMvdmhjaV9kcml2ZXIuYyB8IDIgKy0KIDEgZmlsZSBjaGFuZ2VkLCAxIGlu c2VydGlvbigrKSwgMSBkZWxldGlvbigtKQoKZGlmZiAtLWdpdCBhL3Rvb2xzL3VzYi91c2JpcC9s aWJzcmMvdmhjaV9kcml2ZXIuYyBiL3Rvb2xzL3VzYi91c2JpcC9saWJzcmMvdmhjaV9kcml2ZXIu YwppbmRleCBlZDhjOWQzNjBjMGYuLjQyMjVkNDYyNzAxZCAxMDA2NDQKLS0tIGEvdG9vbHMvdXNi L3VzYmlwL2xpYnNyYy92aGNpX2RyaXZlci5jCisrKyBiL3Rvb2xzL3VzYi91c2JpcC9saWJzcmMv dmhjaV9kcml2ZXIuYwpAQCAtMTUwLDcgKzE1MCw3IEBAIHN0YXRpYyBpbnQgZ2V0X25wb3J0cyhz dHJ1Y3QgdWRldl9kZXZpY2UgKmhjX2RldmljZSkKIAogc3RhdGljIGludCB2aGNpX2hjZF9maWx0 ZXIoY29uc3Qgc3RydWN0IGRpcmVudCAqZGlyZW50KQogewotCXJldHVybiBzdHJjbXAoZGlyZW50 LT5kX25hbWUsICJ2aGNpX2hjZCIpID49IDA7CisJcmV0dXJuICFzdHJuY21wKGRpcmVudC0+ZF9u YW1lLCAidmhjaV9oY2QuIiwgOSk7CiB9CiAKIHN0YXRpYyBpbnQgZ2V0X25jb250cm9sbGVycyh2 b2lkKQo=