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 ED9ECC32792 for ; Thu, 3 Oct 2019 17:42:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BACAC20830 for ; Thu, 3 Oct 2019 17:42:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570124575; bh=mP4xT7AyFhO2FlSlP+yDZXZQHSpTuhtD7Oi7dRd1moI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YKhJKyj+v7MyjUutD4n0WYljYGLByoVW7+PxIuf7V1N3Wex7KSenPySrtrqZxXY/z FjW7BcCodqRkeYCa9TCcUDaNzPK/pL2zKQAlk5nAv4azHG0Uqzt3fHgXLmqecXwxzc eqX8nxiL8vF4/pAqcFiQ05iWq/99tvYAslNnIXGs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730755AbfJCP4s (ORCPT ); Thu, 3 Oct 2019 11:56:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:38870 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730735AbfJCP4q (ORCPT ); Thu, 3 Oct 2019 11:56:46 -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 1C0E321A4C; Thu, 3 Oct 2019 15:56:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570118205; bh=mP4xT7AyFhO2FlSlP+yDZXZQHSpTuhtD7Oi7dRd1moI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RLsaPvg+Th0vWmtUg0qQWkW13dzn7+2WY8OXnqiarkmt74wgC/qYiyOzQ9wK91EWk 8OMwhxprb1lc1FwhciCJ9McN1ffSVEuAKXE+AloJVom3NWo0bxzoQhdO9SS+h2GjGZ IzHIQATebXVNVHuA/R0xc8+Ow29CH9WcqWGKE+zc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oliver Neukum , "David S. Miller" Subject: [PATCH 4.4 27/99] usbnet: sanity checking of packet sizes and device mtu Date: Thu, 3 Oct 2019 17:52:50 +0200 Message-Id: <20191003154307.806811919@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154252.297991283@linuxfoundation.org> References: <20191003154252.297991283@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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: Greg Kroah-Hartman --- drivers/net/usb/usbnet.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -352,6 +352,8 @@ void usbnet_update_max_qlen(struct usbne { 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 usbne dev->tx_qlen = 5 * MAX_QUEUE_MEMORY / dev->hard_mtu; break; default: +insanity: dev->rx_qlen = dev->tx_qlen = 4; } }