From patchwork Tue Oct 26 09:52:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 12584379 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 243E1C4332F for ; Tue, 26 Oct 2021 09:53:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0FFE461039 for ; Tue, 26 Oct 2021 09:53:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233662AbhJZJzn (ORCPT ); Tue, 26 Oct 2021 05:55:43 -0400 Received: from mail.kernel.org ([198.145.29.99]:58236 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233663AbhJZJzk (ORCPT ); Tue, 26 Oct 2021 05:55:40 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6BF9160F24; Tue, 26 Oct 2021 09:53:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1635241996; bh=OgMrTYLYFTRq1xURZC/7AxyMSuua7/BgrWAb5qpfMkk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CDu008QcFkc0rPldMGRzZSqsZ1ikd6nr/zxWCZ9v7hSNrsa+2UIel0BLqJ4T1ZnxR K/tV4FegYOc7hmCI8CIA7BclXrcTEGeCcjvEUho1DqQlLxB2t0nrwQjZhfvDsHI0+9 /xOMmGO2qD2wDdme+t3qFZvYGvm+ZLPvZYb8vv1jA3hEdgeXkILfpadW35Wbws/doi R7byLouhCopM43SsLAv5Ga2oQTMKUVI20C3HGhBJYtgpyciPsecoLk5wp4rsImpm9W qJ/oZRJilo5K4U/J+NTarJvUGoLFASiW/88By6F4GY/UOPzeFF63Z2jo82FCyuG7tp ytQ7vHypm9reg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1mfJ8e-0006sU-1a; Tue, 26 Oct 2021 11:53:00 +0200 From: Johan Hovold To: Kalle Valo Cc: Amitkumar Karwar , Ganapathi Bhat , Sharvari Harisangam , Xinming Hu , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 2/3] ath6kl: fix division by zero in send path Date: Tue, 26 Oct 2021 11:52:13 +0200 Message-Id: <20211026095214.26375-2-johan@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211026095214.26375-1-johan@kernel.org> References: <20211026095214.26375-1-johan@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Add the missing endpoint max-packet sanity check to probe() to avoid division by zero in ath10k_usb_hif_tx_sg() in case a malicious device has broken descriptors (or when doing descriptor fuzz testing). Note that USB core will reject URBs submitted for endpoints with zero wMaxPacketSize but that drivers doing packet-size calculations still need to handle this (cf. commit 2548288b4fb0 ("USB: Fix: Don't skip endpoint descriptors with maxpacket=0")). Fixes: 9cbee358687e ("ath6kl: add full USB support") Cc: stable@vger.kernel.org # 3.5 Signed-off-by: Johan Hovold --- drivers/net/wireless/ath/ath6kl/usb.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/wireless/ath/ath6kl/usb.c b/drivers/net/wireless/ath/ath6kl/usb.c index bd367b79a4d3..aba70f35e574 100644 --- a/drivers/net/wireless/ath/ath6kl/usb.c +++ b/drivers/net/wireless/ath/ath6kl/usb.c @@ -340,6 +340,11 @@ static int ath6kl_usb_setup_pipe_resources(struct ath6kl_usb *ar_usb) le16_to_cpu(endpoint->wMaxPacketSize), endpoint->bInterval); } + + /* Ignore broken descriptors. */ + if (usb_endpoint_maxp(endpoint) == 0) + continue; + urbcount = 0; pipe_num =