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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 B5238C352AA for ; Tue, 1 Oct 2019 16:56:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8379B2168B for ; Tue, 1 Oct 2019 16:56:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569949012; bh=tPnWAe0mpthBXwTVbVe4uSBGjgQbQdtxeBaul5khI9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TVYg+sgHQ6nnvwHU1WEy07ug+SDwKJmXfNZtTucdsUsdefqQCIwfkx3v5CklBHDQN 4nRPIZ5QS6BWlcQ4JkPcWOdypkITr3fftXuQRCC1m5l4DFU7KmdzWZEvn52Pi0m7H4 AO8v+D0yXogHfBnIjypN3WG40f57Kvd26N2LjnzQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731586AbfJAQmC (ORCPT ); Tue, 1 Oct 2019 12:42:02 -0400 Received: from mail.kernel.org ([198.145.29.99]:53758 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731549AbfJAQmA (ORCPT ); Tue, 1 Oct 2019 12:42:00 -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 2F41320B7C; Tue, 1 Oct 2019 16:41:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948119; bh=tPnWAe0mpthBXwTVbVe4uSBGjgQbQdtxeBaul5khI9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BHsaDREhWfmVeTgJX1cGSgJAxGARZjuLH/KqRxwAOWQZ+rMZaw7hO1FarVLCZ77dR A2HA47ob2+d5ZK1FdkWiS6q8euTh++xJXncw3c/ELT85ffRCHSYYCRosIY2z9F76UO WpXZYxOUxYZwR4fEzYHSPmYvyddDQBui4k7Pg6c8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: =?UTF-8?q?Bj=C3=B8rn=20Mork?= , Jakub Kicinski , Sasha Levin , netdev@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 25/63] usbnet: ignore endpoints with invalid wMaxPacketSize Date: Tue, 1 Oct 2019 12:40:47 -0400 Message-Id: <20191001164125.15398-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001164125.15398-1-sashal@kernel.org> References: <20191001164125.15398-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Bjørn Mork [ Upstream commit 8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 ] Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the drivers more robust against invalid and meaningless descriptors. The wMaxPacketSize of these endpoints are used for memory allocations and as divisors in many usbnet minidrivers. Avoiding zero is therefore critical. Signed-off-by: Bjørn Mork Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/usb/usbnet.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 72514c46b4786..07c00e378a5cd 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -100,6 +100,11 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf) int intr = 0; e = alt->endpoint + ep; + + /* ignore endpoints which cannot transfer data */ + if (!usb_endpoint_maxp(&e->desc)) + continue; + switch (e->desc.bmAttributes) { case USB_ENDPOINT_XFER_INT: if (!usb_endpoint_dir_in(&e->desc)) -- 2.20.1