From patchwork Sat May 20 08:30:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe JAILLET X-Patchwork-Id: 96745 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp242335vqo; Sat, 20 May 2023 02:05:12 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5NQj/t4ggb/Ua/0xMoYrpSsHAHv+HEEavvW1qwc4IFTrZ45yeGP3+S+BpzKpMGN03C9YUL X-Received: by 2002:a17:902:c94f:b0:1a9:8ab1:9f3b with SMTP id i15-20020a170902c94f00b001a98ab19f3bmr6540169pla.14.1684573512525; Sat, 20 May 2023 02:05:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684573512; cv=none; d=google.com; s=arc-20160816; b=BvOCC/4Vm/nb7XMGYx6mfnVs45GBuo3AGbDixevsk3ZQc5sTJ2r+FZ8/KULe3b0tf5 T+6Fd9rlfb6chs+U3fo3m4ElZxi2+JlPhTBn6LyguXQ2yEUOifaeZqIWHnZqYuxhkTcD 7sru35FNB/dM8D2OTVkA9fqa/0IY2IUKWP5BaPIfdCDNMq3FPK4Xr8amwH7nAppaTihR 29v6vMd+1w/+t23KA2MPSAxGWlZJVRzgrWySxGU25jEzc7AS+dM+CPsu2l3F8+208Edx 8ZXD/hk/EQGecYNOZG6vWVkJIKhC63lG1nkjMXb+rpIvhTdpGgELjJjsR9zJP3fuEoXx 1AUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=oQETDRJrVbTE0ETdYYPnZKcQRoVWgLVTmKiK6jA9rrg=; b=D/OZcywpnCvBjrNacZpv8PECPwYaU3QTy14U9sVlCkv1suKNgu8oHdHPGeEGpWW2vE imS0f2ziBBex3tL9jWN9RZAxED8HxbIB4UKI+0boUrRMUlkbNebGN6ZvMg+fOKNOJ67y rRfH75AaofEEiWa3i9kkLB/FKXwTv8GPs+gtEdX8xva3gVTn8fMAB+V/Ci+cFRU1P2cu XTj/wbPvU/6kwp+XDdHtyXOISy2FSxlNxO0NFvEA1Le6UqcU4ZOKoNdpXG0knuezN3PV rXEpWQjMjXDEkk11JYVdZpw7SHb/skbUXsfoikUFkDhE5jlRlj3ht8WECe/meuUG6B5W mdJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=fmfKyYeh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u18-20020a170903125200b001a97fd670e6si1206820plh.208.2023.05.20.02.04.59; Sat, 20 May 2023 02:05:12 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@wanadoo.fr header.s=t20230301 header.b=fmfKyYeh; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230280AbjETIa0 (ORCPT + 99 others); Sat, 20 May 2023 04:30:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229523AbjETIaY (ORCPT ); Sat, 20 May 2023 04:30:24 -0400 Received: from smtp.smtpout.orange.fr (smtp-27.smtpout.orange.fr [80.12.242.27]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 600D5A3 for ; Sat, 20 May 2023 01:30:23 -0700 (PDT) Received: from pop-os.home ([86.243.2.178]) by smtp.orange.fr with ESMTPA id 0Hylq5VzBHWsH0HylqQZQ4; Sat, 20 May 2023 10:30:21 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=wanadoo.fr; s=t20230301; t=1684571421; bh=oQETDRJrVbTE0ETdYYPnZKcQRoVWgLVTmKiK6jA9rrg=; h=From:To:Cc:Subject:Date; b=fmfKyYeh/B4aI/deh2jAk95LR+ZzeVPc4Ln4zuzzuZFkDAlcfHLp8OTDNASXkHcIV Ftg2EZf55rTKYNQYyMOHhGb6iYzriNOgnMPrsPtgbexXDDutlsTdqVgXTXCJOTwH3z iLfYflB2vMl9kNWXBMR72sdVKf+wDpI+xcDcI4fmyN470r7OxoLjXaRW5FunRPHCYM 5yFUiTLe0g6BliVHQPUPpimbXeXzg942AnAX7V+sMjxTIC4jZndhv448LQ6bS+c9cU +CGc3tVVhRiPVBE1c46aZ5F8ftOUNKK+D8Jb9T0yKeghb7YoHgAh64NL6P3n4rgmbK Ar4Z68IHOFy5g== X-ME-Helo: pop-os.home X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Sat, 20 May 2023 10:30:21 +0200 X-ME-IP: 86.243.2.178 From: Christophe JAILLET To: Rain River , Zhu Yanjun , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Ayaz Abdulla Cc: linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET , netdev@vger.kernel.org Subject: [PATCH net] forcedeth: Fix an error handling path in nv_probe() Date: Sat, 20 May 2023 10:30:17 +0200 Message-Id: <355e9a7d351b32ad897251b6f81b5886fcdc6766.1684571393.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1766403355467265397?= X-GMAIL-MSGID: =?utf-8?q?1766403355467265397?= If an error occures after calling nv_mgmt_acquire_sema(), it should be undone with a corresponding nv_mgmt_release_sema() call. Add it in the error handling path of the probe as already done in the remove function. Fixes: cac1c52c3621 ("forcedeth: mgmt unit interface") Signed-off-by: Christophe JAILLET Acked-by: Zhu Yanjun Reviewed-by: Simon Horman --- I don't think that the Fixes tag is really accurate, but nv_mgmt_release_sema() was introduced here. And cac1c52c3621 is already old so should be good enough. --- drivers/net/ethernet/nvidia/forcedeth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/ethernet/nvidia/forcedeth.c b/drivers/net/ethernet/nvidia/forcedeth.c index 0605d1ee490d..7a549b834e97 100644 --- a/drivers/net/ethernet/nvidia/forcedeth.c +++ b/drivers/net/ethernet/nvidia/forcedeth.c @@ -6138,6 +6138,7 @@ static int nv_probe(struct pci_dev *pci_dev, const struct pci_device_id *id) return 0; out_error: + nv_mgmt_release_sema(dev); if (phystate_orig) writel(phystate|NVREG_ADAPTCTL_RUNNING, base + NvRegAdapterControl); out_freering: