Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp444596iog; Mon, 13 Jun 2022 06:07:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzkyXQNe5l9ZhWMqIooG7omr/z7dnSU/MZWrT3QgdRgDODbLdd7rUlCJAdv2C2OiVx9+3Ia X-Received: by 2002:a17:906:1501:b0:715:76d0:862a with SMTP id b1-20020a170906150100b0071576d0862amr9069418ejd.681.1655125658706; Mon, 13 Jun 2022 06:07:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655125658; cv=none; d=google.com; s=arc-20160816; b=KarWFJvuYivEJai2uIvYNOrDb5hQIAQQPbzK6/tj7GY5y0kIxQ7TdRZV2kaOLfdFly zEo1EuOF7y74DdXhSLcd3hMEUArsjai+iqEt+mvoleCzN9G6O1qKlLJYPJwWdy/u07fB Vhz6oFHSVCaDCP6XwyoF5gLLXVY79OXggcwZN48mmpKF7TqFPSBxw5eg1lhTYF+RsqQJ oPLIXCjs6y9Hd8deHI6VlCMN5Mx4Yqzkxjl50sZ4jcdSg3L4EixKIt4aEn3jq4bfFPYM PC7VZaoNA3v6w+3J7ddm7hp388TWPviAt3OSZko0PMSJxW7hzot9T+ZrNUwm94rWEwW5 ttQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FAtWunBZeMxwRfu5jeGR6mKsZgx8GypzGZ+XDHOcPFA=; b=XkqC4qdqzXJN8JWF9j/neKeYnZ0BqUORo9i5jiQTnCEuCc7xGGvfiBrNAiN2whEpBg PzwuTeqa9NSPeIHjlYBpWOy1oc34LWxREBccgF2lY9EmzuCEpgMENUq12VlYSjOUyEla N6BvHcdezWfeA4l4jGghvoSIw6y748QB2rovZ2vnubmhmOkhOHUaFHrARPL9TNinfHrI BsjT7KbhaPRHBOUCXjvoAS7T5xJ6O39/m2nwgQHlkr5jRLLewvPxLIiCNj/dmvdK8Hrq 9GOOeItbytImm481Ip82YaCZw/9yYewIHgyd1+VBEye62f+rh2cdtZPWpob4YL7opnuP USyw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="0sh5dr/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s9-20020a170906778900b006f3fd7b244fsi7339796ejm.102.2022.06.13.06.07.11; Mon, 13 Jun 2022 06:07:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="0sh5dr/7"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243923AbiFMKZo (ORCPT + 99 others); Mon, 13 Jun 2022 06:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244830AbiFMKYL (ORCPT ); Mon, 13 Jun 2022 06:24:11 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E61A3DEA9; Mon, 13 Jun 2022 03:18:24 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id DB1B560AE6; Mon, 13 Jun 2022 10:18:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E2434C3411C; Mon, 13 Jun 2022 10:18:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655115503; bh=lWzxDcM+oNVyARterZsgb4KRcuK7rk/l6vBMcvJlKf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0sh5dr/7U5R1FV80dwXNNKHhI0wf2PUkbys5u3l7qJaADZZH9D4oHpzufIwr9rZ1y fQli6Eu0T9r+aPWnbaaTJuhc8+tpWUKjQZqtxPaR84M0Ao6oVwhK1DfBM8KBrP+Bzf F0P0lUJmGYiUq5E+5+vGEZQ3OLLS4bgxIGTFiwh0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, pa@panix.com, Alexander Wetzel , Kalle Valo Subject: [PATCH 4.9 099/167] rtl818x: Prevent using not initialized queues Date: Mon, 13 Jun 2022 12:09:33 +0200 Message-Id: <20220613094904.087405436@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094840.720778945@linuxfoundation.org> References: <20220613094840.720778945@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexander Wetzel commit 746285cf81dc19502ab238249d75f5990bd2d231 upstream. Using not existing queues can panic the kernel with rtl8180/rtl8185 cards. Ignore the skb priority for those cards, they only have one tx queue. Pierre Asselin (pa@panix.com) reported the kernel crash in the Gentoo forum: https://forums.gentoo.org/viewtopic-t-1147832-postdays-0-postorder-asc-start-25.html He also confirmed that this patch fixes the issue. In summary this happened: After updating wpa_supplicant from 2.9 to 2.10 the kernel crashed with a "divide error: 0000" when connecting to an AP. Control port tx now tries to use IEEE80211_AC_VO for the priority, which wpa_supplicants starts to use in 2.10. Since only the rtl8187se part of the driver supports QoS, the priority of the skb is set to IEEE80211_AC_BE (2) by mac80211 for rtl8180/rtl8185 cards. rtl8180 is then unconditionally reading out the priority and finally crashes on drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c line 544 without this patch: idx = (ring->idx + skb_queue_len(&ring->queue)) % ring->entries "ring->entries" is zero for rtl8180/rtl8185 cards, tx_ring[2] never got initialized. Cc: stable@vger.kernel.org Reported-by: pa@panix.com Tested-by: pa@panix.com Signed-off-by: Alexander Wetzel Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20220422145228.7567-1-alexander@wetzel-home.de Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) --- a/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c +++ b/drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c @@ -460,8 +460,10 @@ static void rtl8180_tx(struct ieee80211_ struct rtl8180_priv *priv = dev->priv; struct rtl8180_tx_ring *ring; struct rtl8180_tx_desc *entry; + unsigned int prio = 0; unsigned long flags; - unsigned int idx, prio, hw_prio; + unsigned int idx, hw_prio; + dma_addr_t mapping; u32 tx_flags; u8 rc_flags; @@ -470,7 +472,9 @@ static void rtl8180_tx(struct ieee80211_ /* do arithmetic and then convert to le16 */ u16 frame_duration = 0; - prio = skb_get_queue_mapping(skb); + /* rtl8180/rtl8185 only has one useable tx queue */ + if (dev->queues > IEEE80211_AC_BK) + prio = skb_get_queue_mapping(skb); ring = &priv->tx_ring[prio]; mapping = pci_map_single(priv->pdev, skb->data,