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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 C76F2C433DF for ; Tue, 9 Jun 2020 00:23:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9CD98207FB for ; Tue, 9 Jun 2020 00:23:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591662232; bh=zLNT7SPsUqLxsj5GoZDza4/dGVqh4mhuzg2E7jcmtn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=udX8tM+CgxfVsrnVN3FDTCmW6kTzQ19elPl+5G7CCv7hQJgl58kltfVuLHg14NOl8 UXY4KyCGHePIHZw6zCM3ROvzvn2mqg6vRJNRkaXnm1uXPElOq7uU3pconfnaFSYtBp O4x7VT7EguH38IOAuQF91mzIrQliFMkdUzrgWzGo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730617AbgFIAXu (ORCPT ); Mon, 8 Jun 2020 20:23:50 -0400 Received: from mail.kernel.org ([198.145.29.99]:38480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730410AbgFHXRM (ORCPT ); Mon, 8 Jun 2020 19:17:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4104C20842; Mon, 8 Jun 2020 23:17:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591658232; bh=zLNT7SPsUqLxsj5GoZDza4/dGVqh4mhuzg2E7jcmtn0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JLwMw7QBke1+c/2PYvAG0aOCL6/KG+cbEsZF2qygx2flU3Vu8z9tqnPAwH4WCDojO 1yqxD6VnGd4AIgFyEc8LEQBfqCDsLhEoa4uV0BfZYqL1hI93hEiWMYkktJriTpMY7e uyZCMftnfHRZxHdMxvWR46cqm1qaomQRE/+Moa5A= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , "David S . Miller" , Greg Kroah-Hartman , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 245/606] net: sun: fix missing release regions in cas_init_one(). Date: Mon, 8 Jun 2020 19:06:10 -0400 Message-Id: <20200608231211.3363633-245-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608231211.3363633-1-sashal@kernel.org> References: <20200608231211.3363633-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Qiushi Wu commit 5a730153984dd13f82ffae93d7170d76eba204e9 upstream. In cas_init_one(), "pdev" is requested by "pci_request_regions", but it was not released after a call of the function “pci_write_config_byte” failed. Thus replace the jump target “err_write_cacheline” by "err_out_free_res". Fixes: 1f26dac32057 ("[NET]: Add Sun Cassini driver.") Signed-off-by: Qiushi Wu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/sun/cassini.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/ethernet/sun/cassini.c b/drivers/net/ethernet/sun/cassini.c index 6ec9163e232c..b716f188188e 100644 --- a/drivers/net/ethernet/sun/cassini.c +++ b/drivers/net/ethernet/sun/cassini.c @@ -4971,7 +4971,7 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) cas_cacheline_size)) { dev_err(&pdev->dev, "Could not set PCI cache " "line size\n"); - goto err_write_cacheline; + goto err_out_free_res; } } #endif @@ -5144,7 +5144,6 @@ static int cas_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_free_res: pci_release_regions(pdev); -err_write_cacheline: /* Try to restore it in case the error occurred after we * set it. */ -- 2.25.1