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=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 5973DC2D0DB for ; Thu, 30 Jan 2020 18:52:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 27F112082E for ; Thu, 30 Jan 2020 18:52:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580410349; bh=raX50WWaKVukrHP5KXHr94zDerD/GUrE8P+KgpctcOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SI31Q8IE1DJxwi5CweGwUWOg00vtkiDvCgC0s76eK2K/mKfMgBq8Hdv7XPrGOFBP3 LWdZrliB4wO0RvXElRs/uas+TkhPNXBJjSUO98BdBaSXIE5Mplv2+sqRiNXdJ5fmCS vMPq+SA34v6XtKVGZOGwnqXT3Mzy+tABhLfR1Fac= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730613AbgA3Sng (ORCPT ); Thu, 30 Jan 2020 13:43:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:52268 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730632AbgA3Snc (ORCPT ); Thu, 30 Jan 2020 13:43:32 -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 A4BC620702; Thu, 30 Jan 2020 18:43:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580409812; bh=raX50WWaKVukrHP5KXHr94zDerD/GUrE8P+KgpctcOo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ND8a9CjONwRRbUDsHGtlEtgeCZ9hrmE96DNbV52VXODE6SkrN8yEGXPYX/WiqE3ot v8Y8w8+ikq4PNMJi81lVjQCDnEfs1ZIuUfNx/vzMY0xjXctQyg0dsdb87rxebHU0V6 ow5a6X3n8XGCkSDsF7ELuN5PzYFs0K+CL3uMpCS4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , Ido Schimmel , "David S. Miller" Subject: [PATCH 5.4 041/110] mlxsw: minimal: Fix an error handling path in mlxsw_m_port_create() Date: Thu, 30 Jan 2020 19:38:17 +0100 Message-Id: <20200130183620.204606891@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200130183613.810054545@linuxfoundation.org> References: <20200130183613.810054545@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: Christophe JAILLET [ Upstream commit 6dd4b4f3936e17fedea1308bc70e9716f68bf232 ] An 'alloc_etherdev()' called is not ballanced by a corresponding 'free_netdev()' call in one error handling path. Slighly reorder the error handling code to catch the missed case. Fixes: c100e47caa8e ("mlxsw: minimal: Add ethtool support") Signed-off-by: Christophe JAILLET Reviewed-by: Ido Schimmel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/mellanox/mlxsw/minimal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlxsw/minimal.c +++ b/drivers/net/ethernet/mellanox/mlxsw/minimal.c @@ -204,8 +204,8 @@ mlxsw_m_port_create(struct mlxsw_m *mlxs err_register_netdev: mlxsw_m->ports[local_port] = NULL; - free_netdev(dev); err_dev_addr_get: + free_netdev(dev); err_alloc_etherdev: mlxsw_core_port_fini(mlxsw_m->core, local_port); return err;