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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,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 8C66DC432C0 for ; Tue, 3 Dec 2019 22:44:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4F5D02073C for ; Tue, 3 Dec 2019 22:44:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413091; bh=NHzBsxP56xjA1s7nkjexOr7DjOW7Bmyz1+WJUlNZdFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=pPt9MxuCPJcKgQEr6DBJGj7+7P/dfh0N5ks/lYVdvL1oY5JHmg2qXAEYAFIR8/buK Vn2wK4BVqrV8T8V+KBc3G6fpsm+FiJg7lqHOhJeE6phpQVG70BBgrgk4/a5N27KgZr uucLkGhTpQooozYBYRWM+Jk4LzFcvPGTPAeOUcMA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728970AbfLCWou (ORCPT ); Tue, 3 Dec 2019 17:44:50 -0500 Received: from mail.kernel.org ([198.145.29.99]:32802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728663AbfLCWor (ORCPT ); Tue, 3 Dec 2019 17:44:47 -0500 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 73F61206EC; Tue, 3 Dec 2019 22:44:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413086; bh=NHzBsxP56xjA1s7nkjexOr7DjOW7Bmyz1+WJUlNZdFQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dhD83EZCs0rRxZtc0mTFwSJcWmgNKj9gY2Vhrg1mFeN8plkZ+x/t4utc2/P5kn/pZ wKSnL77IRnIU0NtQiUY5VmblPToxsSxP7ArC6AY3AKXKhXuaO6/CjGroHPX3FY3C5g Dr9N/s0VFg6u4tYCjG2RB0JIxzfZdLCFPYT3gLck= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Johannes Berg , =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= , Sasha Levin Subject: [PATCH 5.3 089/135] mac80211: fix ieee80211_txq_setup_flows() failure path Date: Tue, 3 Dec 2019 23:35:29 +0100 Message-Id: <20191203213036.056617451@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203213005.828543156@linuxfoundation.org> References: <20191203213005.828543156@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Johannes Berg [ Upstream commit 6dd47d9754ff0589715054b11294771f2c9a16ac ] 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 Acked-by: Toke Høiland-Jørgensen Link: https://lore.kernel.org/r/20191105154110.1ccf7112ba5d.I0ba865792446d051867b33153be65ce6b063d98c@changeid Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- 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 4c2702f128f3a..868705ed5cbbb 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c @@ -1297,8 +1297,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