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=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 1D6B2C352AA for ; Tue, 1 Oct 2019 16:54:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DF9B921783 for ; Tue, 1 Oct 2019 16:54:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948865; bh=Q+BxTpxl1yyf6CTkUQrsfcgTDYJOqPZL8IcLXQm2SYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=1moRN3ETbSzn+x+sBY2d6thzYPnHWDQBMBS2rQRT5B4KBdsDoxjeTt2RVZSFAGdGw 9uubR7i8d/UQ1Pw2JrZBKa9I0fUWLMPeIsxWHxO9bEVhMP1BeQj6EuQkoSiVf9C3Io OZ6vPCRcQwaVQtATHDL6GTQEBcCXOgDmLIGsURps= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729614AbfJAQyX (ORCPT ); Tue, 1 Oct 2019 12:54:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:55072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732430AbfJAQnH (ORCPT ); Tue, 1 Oct 2019 12:43: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 C6941205C9; Tue, 1 Oct 2019 16:43:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948186; bh=Q+BxTpxl1yyf6CTkUQrsfcgTDYJOqPZL8IcLXQm2SYI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LZeJJtZt4bbYsn5KhyB7ky7qlRf6DO/15qEm4BPiyoshmu/F+Kp5PXGWVvAtpK221 gKioZzOZODH4U3S2G3dCIg7wGCj6V7OdbH7fHGGzgYb6W3ox8HOOSjMTqZ9XqFIAah Wk9R+yjaes+/fcumdWeRrFKCk8fNyjM85awax8zA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Oliver Neukum , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 61/63] usbnet: sanity checking of packet sizes and device mtu Date: Tue, 1 Oct 2019 12:41:23 -0400 Message-Id: <20191001164125.15398-61-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 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org From: Oliver Neukum [ Upstream commit 280ceaed79f18db930c0cc8bb21f6493490bf29c ] After a reset packet sizes and device mtu can change and need to be reevaluated to calculate queue sizes. Malicious devices can set this to zero and we divide by it. Introduce sanity checking. Reported-and-tested-by: syzbot+6102c120be558c885f04@syzkaller.appspotmail.com Signed-off-by: Oliver Neukum Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/usb/usbnet.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index 07c00e378a5cd..ef1d667b0108b 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -344,6 +344,8 @@ void usbnet_update_max_qlen(struct usbnet *dev) { enum usb_device_speed speed = dev->udev->speed; + if (!dev->rx_urb_size || !dev->hard_mtu) + goto insanity; switch (speed) { case USB_SPEED_HIGH: dev->rx_qlen = MAX_QUEUE_MEMORY / dev->rx_urb_size; @@ -360,6 +362,7 @@ void usbnet_update_max_qlen(struct usbnet *dev) dev->tx_qlen = 5 * MAX_QUEUE_MEMORY / dev->hard_mtu; break; default: +insanity: dev->rx_qlen = dev->tx_qlen = 4; } } -- 2.20.1