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=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 55F55C352AA for ; Tue, 1 Oct 2019 16:45:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 20DD920673 for ; Tue, 1 Oct 2019 16:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948358; bh=mk5iIBm36LcEuCtK3oumbY0OImfvkXR9DqoF5xcMf8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=wz/0oWX8GDfjoBfn7SrzcgyjvyTJoYBoCH456Hi/LFKJ6CsLn501aavQ3+Mw8J8NL kjR0Z30aWi1dx9EEDa9oj+PqbFMUomkptuzAu/rQWpm41nBm50jSOBhAE74t3PCynz W/nh4wG2cApb7kveKkBKdVom8JTETob3iFIdSB0Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390454AbfJAQp4 (ORCPT ); Tue, 1 Oct 2019 12:45:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:58504 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388247AbfJAQpw (ORCPT ); Tue, 1 Oct 2019 12:45:52 -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 A3F8821783; Tue, 1 Oct 2019 16:45:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569948352; bh=mk5iIBm36LcEuCtK3oumbY0OImfvkXR9DqoF5xcMf8k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TejL0ZUi6tQZgU9guBZKaOjnqjxuRzycDdntH5uYYvWnfVD3z/Oi+woq0zAowrJX6 n29L762kS1pO6vjBnnSpTWFKy9oPWv4zJ6Cdp1u0sVf6YcG1+ecKwHChHyF4fJ8lQc H7vjmoUyDUm4y+7bSVo3mdNbxoQP36RhTOEaMMR4= 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 4.4 14/15] usbnet: sanity checking of packet sizes and device mtu Date: Tue, 1 Oct 2019 12:45:32 -0400 Message-Id: <20191001164533.16915-14-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191001164533.16915-1-sashal@kernel.org> References: <20191001164533.16915-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 6c531abe198bb..5a09aff4155ab 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -352,6 +352,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; @@ -367,6 +369,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