From patchwork Sun May 13 23:38:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tarick Bedeir X-Patchwork-Id: 912633 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="qo7Uxwg3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40kgJz1Jhxz9s0w for ; Mon, 14 May 2018 09:39:15 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752013AbeEMXiv (ORCPT ); Sun, 13 May 2018 19:38:51 -0400 Received: from mail-vk0-f73.google.com ([209.85.213.73]:34849 "EHLO mail-vk0-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751053AbeEMXit (ORCPT ); Sun, 13 May 2018 19:38:49 -0400 Received: by mail-vk0-f73.google.com with SMTP id w84-v6so13785761vkw.2 for ; Sun, 13 May 2018 16:38:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:date:message-id:subject:from:to:cc; bh=7YqH/ABEwkf/92fMuG+Hm3+TAT0EHJEx2qrWFob8VWY=; b=qo7Uxwg3QOTdk2Fw1Z3ziCEbnjO+qySIZvTVZeMfq4hjoveknvyeKoYcHRJkijMDlS goxGUFZ+dNtot9IDRiKKzQfVPmUz+OKuAt+aQBlV9cdkqABH0xQWplP6uQVEyIKvG7FN vjKpyxzeNO9EOFXSOuXqSMpxRjZX4ZM3z+wvU7p3DDEvaUS49OPLd4TxUXUR5hmSep6x h/w3WNAhmNvzmol5kmgC0xwev9ufgbhG3xG6nMVaSEK35urOwMzo8nJD5osIit0McHnC 5aIHDTCizHum+sPPYXMYmyQUMv6fHuCsVc5sguEljLF7p9mgarXAJTHmqvLIVGCNnt59 R5Yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:date:message-id:subject:from:to:cc; bh=7YqH/ABEwkf/92fMuG+Hm3+TAT0EHJEx2qrWFob8VWY=; b=h6+VtNFT2ZOQQerp+ue/rG9cUIcXJz4DgXT9JPVctOUPrx61TRNmywDuvybcTppuUO tSJE1PUqaaDAycpuRaGpXsrPJX3cB1RcFK4SlvYlYqqAdekcx4IXq3k/6NcXxumUoUO3 fGzq/gYWdRR+147VkmQKF0xyv7v8W7FWu6d4xQj73CAyKYyN6qiHLWrabaQvEgMZoP7k KkXSdlqhiCt1B8ydREIGTV74BOqAjhc92SVHhsL/Rl9y/MQu0+gtoGiQKCZR1/KjtJCR 5Y+vtU6U4mD5L9SHJW+OQ/qmuiSsBaP/5lxLJ4t6ihkkEtXjodoqLLJ83oWQTpaHoqas 2DEg== X-Gm-Message-State: ALKqPwfSEkewqcWg6maJF3TYTNcFSHUVNdSlWK2wG/Mn2+xPXrya6jgC TS9MeM0SJ+6PSUkzW/ZZsVi1A8480A== X-Google-Smtp-Source: AB8JxZoqgMhEKU9TVLxD8umdWjGJnQ7uT+Ab5GEshOaiQHRFXXFx+djvcrj5CJa6saIwzHIANLXgnDEVYB8= MIME-Version: 1.0 X-Received: by 2002:a1f:3002:: with SMTP id w2-v6mr9293566vkw.15.1526254728511; Sun, 13 May 2018 16:38:48 -0700 (PDT) Date: Sun, 13 May 2018 16:38:45 -0700 Message-Id: <20180513233845.135290-1-tarick@google.com> X-Mailer: git-send-email 2.17.0.441.gb46fe60e1d-goog Subject: [PATCH v2] net/mlx4_core: Fix error handling in mlx4_init_port_info. From: Tarick Bedeir To: tariqt@mellanox.com, gthelen@google.com, netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, tarick@google.com Cc: Greg Thelen , netdev@vger.kernel.org, linux-rdma@vger.kernel.org, linux-kernel@vger.kernel.org, Tarick Bedeir Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Avoid exiting the function with a lingering sysfs file (if the first call to device_create_file() fails while the second succeeds), and avoid calling devlink_port_unregister() twice. In other words, either mlx4_init_port_info() succeeds and returns zero, or it fails, returns non-zero, and requires no cleanup. Fixes: 096335b3f983 ("mlx4_core: Allow dynamic MTU configuration for IB ports") Signed-off-by: Tarick Bedeir Reviewed-by: Leon Romanovsky Reviewed-by: Tariq Toukan --- v1 -> v2: Added "Fixes" tag. --- drivers/net/ethernet/mellanox/mlx4/main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c index 4d84cab77105..e8a3a45d0b53 100644 --- a/drivers/net/ethernet/mellanox/mlx4/main.c +++ b/drivers/net/ethernet/mellanox/mlx4/main.c @@ -3007,6 +3007,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) mlx4_err(dev, "Failed to create file for port %d\n", port); devlink_port_unregister(&info->devlink_port); info->port = -1; + return err; } sprintf(info->dev_mtu_name, "mlx4_port%d_mtu", port); @@ -3028,9 +3029,10 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) &info->port_attr); devlink_port_unregister(&info->devlink_port); info->port = -1; + return err; } - return err; + return 0; } static void mlx4_cleanup_port_info(struct mlx4_port_info *info)