Received: by 2002:a5d:9c59:0:0:0:0:0 with SMTP id 25csp2140384iof; Tue, 7 Jun 2022 21:06:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyHTtjbdAMJVyi6qomCqv1NTy9V53CwQhhJAsRjsqyCqeSOPl+/4kRNDmNqll90pw6Z4CbF X-Received: by 2002:a17:903:41d0:b0:167:68a7:c3d with SMTP id u16-20020a17090341d000b0016768a70c3dmr19245250ple.161.1654661159989; Tue, 07 Jun 2022 21:05:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654661159; cv=none; d=google.com; s=arc-20160816; b=BaXWWhuQm+On2YMNX2zNoDoMnaS493xNxEjKYYDBUxRy3Bjy4P33M/wly6m1D+RTW0 P9HeAsZIA16nuBKUCYPa+C1IB9O5lsfTshVg0ByEneXzowql9HrhQNKBO+Fm8el6AK7U RfLEr3fLvXTiojoppF9p8JdS1ADp/dQKMYz6vjZd0bL7LvkI0Ee6ux6qJkLsP6vlN+Lr TKz70zEBz3VbOhW7vnRLJ97mAHz+Z72MtkurTrNvR9gKHctnvz7TIUMJbv74IKYkCSlX VBBibsY2AT5bXHBag+Lr9gnMOH0nMU0tG1QbQogtbDpq9TQFhqKRzqe65fPptDoMocpe x9Xw== 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=yTFlGE/sSkxCQbZK/hgai546ooW/FKvAK/GzojJc23Y=; b=NU2MC5W/r/68vuI4YIc2G3CxlrYT1/BXiLyemTt6x3iXzhAumVTgXF859FmwUSUSYv OjdsZNqan+tb2JlFvC+M346DUFE46GZ5aWEGCsDB4TKdji25zfw7jyXxyVzP5wa7ranJ pKeAmmPxu99bj1qsmaithvZl1Ml6nAMfc4+nJgFkNHoOm461irf+tY7Y7iHZ13bj+jq3 SgemYJCJewbYnsjuHHB2WcrvZl4M19oYMnZnRqlYmuTnPF2SrUFJ7wy9BWsN6xFwr10n 4AJhw5dXsG2h23oshrgZSpOGTneL3/hA3Mgac/FAMStS0Fjb4VluEdM5E+8/e2AbfR2j ddmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q6hp4j1I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id h4-20020a17090aa88400b001e05bcf0287si14148860pjq.189.2022.06.07.21.05.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 21:05:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=q6hp4j1I; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id AA3612132BF; Tue, 7 Jun 2022 20:33:48 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1382015AbiFGVqF (ORCPT + 99 others); Tue, 7 Jun 2022 17:46:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379005AbiFGUwr (ORCPT ); Tue, 7 Jun 2022 16:52:47 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D85E606D3; Tue, 7 Jun 2022 11:43:35 -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 B294E61295; Tue, 7 Jun 2022 18:43:34 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BDB9DC385A2; Tue, 7 Jun 2022 18:43:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1654627414; bh=4v+cu7e+Xt75WklgaATgEEarc6UDXVoriEbxTMfiz7c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=q6hp4j1ITkWFVki+DWjWBXbP7rj0Qnd+Dj+/6VZyVgpokCciYPW60V97tFxegvLM6 u/AOgW6MQzm2sY6BXUFc5+FfdqfeoG7RXuGCVMYQZu+9Q/QIa40E/al+SArZPD2Un6 QYtb5e5L2nLIFoy5OyAKIp+1TPd/NTdC/CHt1dKc= 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 5.17 729/772] rtl818x: Prevent using not initialized queues Date: Tue, 7 Jun 2022 19:05:21 +0200 Message-Id: <20220607165010.522757570@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220607164948.980838585@linuxfoundation.org> References: <20220607164948.980838585@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=-3.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 = dma_map_single(&priv->pdev->dev, skb->data, skb->len,