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=-13.0 required=3.0 tests=BAYES_00,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 C3234C433E1 for ; Mon, 27 Jul 2020 14:14:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9671D2173E for ; Mon, 27 Jul 2020 14:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859290; bh=HlMBUHKc/l//FkPc/NhomJaFxEY5jBPEamb9bIqqRe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=lp/f1jNYWqDIjGNypNbQVbrGnHAA8f/KIMmy38DmHMYTBYuUDuaz831cpHjUF1CP2 RAs3PCMxbqNXK1sFXvOS/mWulEo8Ci6HU1rqVpRSYh8pqkmLLEVWOIK2lWnYglbEIq 5HqVs27+BBXUPRDHgCNH90uoVzQvE/jpJIIpcHHA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730600AbgG0OOs (ORCPT ); Mon, 27 Jul 2020 10:14:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:40706 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730551AbgG0OOr (ORCPT ); Mon, 27 Jul 2020 10:14:47 -0400 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 061592083E; Mon, 27 Jul 2020 14:14:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1595859286; bh=HlMBUHKc/l//FkPc/NhomJaFxEY5jBPEamb9bIqqRe8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUNs4l8Pn2aazf98LHAZ/DAX6UejqrJLzD6ABBjcSJd2Vb6U8ErxFTDjFyp83sMmX Vqw1TZ9MLu0rFuqYhZ2vm37BJV0XZLOmq0aBNue1KCqERP3CMafUaP30TswbgvUqWd ollY1MSvOeZacqsZfVl+XP3js3EFGyQpOKokGzzU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Liu Jian , Ido Schimmel , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 050/138] mlxsw: destroy workqueue when trap_register in mlxsw_emad_init Date: Mon, 27 Jul 2020 16:04:05 +0200 Message-Id: <20200727134927.858611020@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200727134925.228313570@linuxfoundation.org> References: <20200727134925.228313570@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Liu Jian [ Upstream commit 5dbaeb87f2b309936be0aeae00cbc9e7f20ab296 ] When mlxsw_core_trap_register fails in mlxsw_emad_init, destroy_workqueue() shouled be called to destroy mlxsw_core->emad_wq. Fixes: d965465b60ba ("mlxsw: core: Fix possible deadlock") Signed-off-by: Liu Jian Reviewed-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/mellanox/mlxsw/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c index 0a0884d86d44d..1b204ce30ee42 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/core.c +++ b/drivers/net/ethernet/mellanox/mlxsw/core.c @@ -592,7 +592,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) err = mlxsw_core_trap_register(mlxsw_core, &mlxsw_emad_rx_listener, mlxsw_core); if (err) - return err; + goto err_trap_register; err = mlxsw_core->driver->basic_trap_groups_set(mlxsw_core); if (err) @@ -604,6 +604,7 @@ static int mlxsw_emad_init(struct mlxsw_core *mlxsw_core) err_emad_trap_set: mlxsw_core_trap_unregister(mlxsw_core, &mlxsw_emad_rx_listener, mlxsw_core); +err_trap_register: destroy_workqueue(mlxsw_core->emad_wq); return err; } -- 2.25.1