Received: by 2002:a25:31c3:0:0:0:0:0 with SMTP id x186csp859547ybx; Tue, 5 Nov 2019 06:42:24 -0800 (PST) X-Google-Smtp-Source: APXvYqydbZnRJ859bR7oN9VfIfitU8pVXM/AZpQ2pFobIOeWPzfWkgDs+GyiaPMKKdWbKvSh9ZNI X-Received: by 2002:a17:906:a38d:: with SMTP id k13mr17591180ejz.213.1572964944376; Tue, 05 Nov 2019 06:42:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1572964944; cv=none; d=google.com; s=arc-20160816; b=YsuPwf3ssOvgYQCxayYTAKil4YWhNnUzbResNRKZijbk1MlIIuZ0HEPD71owtFi4U/ Z2YwZcu1oKhlFKFI47WCFs+ncaVRunPf05m+NblGD22hi9iks9qgyqtoaZfX/ySqMsef 5ILTF/zz9HYCgHKLZOuKJ2bPWRppiySKK0cT4lFVg9C8UUQ9qt8kUQ1puPL02Zd1c45J qsAfBSp+JgAy6Z6ViBly0sRAaatwQdEu8EWzPxPNDC4iTlC9Ktvqmbv3F7ppAJLoJZGR 6sv86RE/H38ArPMEumDG8CFKlcNEyrSWdrq+zT+Qv6fm2VPZl3KWQaNgu7XunjuwGRA8 YmhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=p+jn0RCC7nP52GnMnzTMRufiOEcZNnxMPn5CXLfQom4=; b=D7wLU+Sm2KMrKP0XJdOwS1DjaT+eDWDlrtnUo3GZAhV39MxKIqApNuehmvtrZpTC2J K5Ac3YTDKOFTPfF3SSkCSQ+2qhd9T5af+urYrryHONpheFw/cYHC+p1X/CEZo+sGdBpy 2maDmczwF0AxIpK8EVoIwvERu34uvLPr1wmO3jJr+fV/L2qZ/HIf+ypAEPZtd319bo0P bvkGJKCk98b+WcCYegwjrFa3Ulu1nDJxH/+mgVHrycTkNS7HYABhDXw2TexlCSSkbBjy 6ZbA3R4GvF8NIkmBIO7JLxA2HGaF4IwbLJjWkrtichvCtRmYa3YYy+O4LjKnVlJc6C85 0ctw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h58si10441934eda.18.2019.11.05.06.41.49; Tue, 05 Nov 2019 06:42:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387662AbfKEOlc (ORCPT + 99 others); Tue, 5 Nov 2019 09:41:32 -0500 Received: from s3.sipsolutions.net ([144.76.43.62]:36558 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728417AbfKEOlc (ORCPT ); Tue, 5 Nov 2019 09:41:32 -0500 Received: by sipsolutions.net with esmtpsa (TLS1.3:ECDHE_X25519__RSA_PSS_RSAE_SHA256__AES_256_GCM:256) (Exim 4.92.2) (envelope-from ) id 1iS01H-0008U3-VY; Tue, 05 Nov 2019 15:41:20 +0100 From: Johannes Berg To: linux-wireless@vger.kernel.org Cc: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Johannes Berg Subject: [PATCH] mac80211: fix ieee80211_txq_setup_flows() failure path Date: Tue, 5 Nov 2019 15:41:11 +0100 Message-Id: <20191105154110.1ccf7112ba5d.I0ba865792446d051867b33153be65ce6b063d98c@changeid> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg If ieee80211_txq_setup_flows() fails, we don't clean up LED state properly, leading to crashes later on, fix that. Fixes: dc8b274f0952 ("mac80211: Move up init of TXQs") Signed-off-by: Johannes Berg --- net/mac80211/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/mac80211/main.c b/net/mac80211/main.c index aba094b4ccfc..2d05c4cfaf6d 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1292,8 +1292,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ieee80211_remove_interfaces(local); fail_rate: rtnl_unlock(); - ieee80211_led_exit(local); fail_flows: + ieee80211_led_exit(local); destroy_workqueue(local->workqueue); fail_workqueue: wiphy_unregister(local->hw.wiphy); -- 2.20.1