Received: by 2002:a25:c593:0:0:0:0:0 with SMTP id v141csp895942ybe; Wed, 4 Sep 2019 09:17:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqx/qKHPfFfPQt99paFZhqKVTEUZoM5gafahZ8dfovjgP80CaBT23yEfYrWNL21C+nrISXEh X-Received: by 2002:a17:90a:2e08:: with SMTP id q8mr5998607pjd.43.1567613874047; Wed, 04 Sep 2019 09:17:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567613874; cv=none; d=google.com; s=arc-20160816; b=tdVePXw3kcGxq1V2UCll8VEYyl4rhERSAXI0QrriE9QtxysNsHXOV7oplWOcnQ80f1 1oN4Fia+KHytbp+ajrplxkrG08MBbFZW0QcQEaQ+JAjIUdjbrQFEUEh/RLdKvcD8uDJK 1USyrpN4NZ8Y0Y4xeQGF5sLHeOPAt4E8VFy4s+Ww7gb9yg83qq67jPYgl7kLtJFRWSnx 33kf7bC5EW1n6I8jtleDRDfbjObOqRiQTjAABii0nA6HwSr4/4qnfpHxGZztuPhEwr/c SMZshAU/u4kqSrdzX4VnhGx3EEkaaaYVAwENw4Pk5txatGQsRjvvUR4/EF9dJB3fLX4z PTmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=pOV7VHOdzebxPdyBxl6WKuVNwwbH292S2sKFOth0g9g=; b=zR0yq7J1SDsGKC3f6iiQiXYu8OqQ3sXRUVSJCQYFaeNQl5bAp7JykK+YfMu8avARYi hVvadOIIVfn7JVtbbAZ7ZmDJE3VjVUsB+xNpU8VVY7Qzd0mn8PX1U7cBqN/CQ6xZW4dC 2tXP0wSObo/VpmufIO1Qy940kCVyQcLjG3qTBLNn/M/jbOiwSzG3DB95+2P7DxVc+yq/ DsIWQt5yGAwwXB38O2UEsTefV5QPwmu5zyAxaWiTwFcVlTMjIf6zwYiNllmVm7/BBuUC UJiUP9zKcqAQl1i4F2fatb8YCuskhugq3UBXosd0G5qq2syafi0u/7KKmotbDg++HQpw goGg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hbCN6Y2C; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v17si2683054pju.18.2019.09.04.09.17.37; Wed, 04 Sep 2019 09:17:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=hbCN6Y2C; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387456AbfIDQP4 (ORCPT + 99 others); Wed, 4 Sep 2019 12:15:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:34232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732439AbfIDP7i (ORCPT ); Wed, 4 Sep 2019 11:59:38 -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 2DBC72087E; Wed, 4 Sep 2019 15:59:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1567612777; bh=fyQekP0mArh+zpjTNqJQ4onGKRm1HDxeaza/MX5kIQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hbCN6Y2CDtrJ/XM1s3mORozk8Nm4yiiNv6erWEAAW/rWHu8pFUf0SqUqVQjXF2dW+ BB8SjU/1zFkQ3W5JCTZN/F+dykJkOFUIv/a+q1RhmAi6Bk3treYQZz0se7LAObwUIl ZiAtDjlJx+iN58RaH5bYNMz1YaJsGVj4amiI6m/M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: YueHaibing , Hulk Robot , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 75/94] amd-xgbe: Fix error path in xgbe_mod_init() Date: Wed, 4 Sep 2019 11:57:20 -0400 Message-Id: <20190904155739.2816-75-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904155739.2816-1-sashal@kernel.org> References: <20190904155739.2816-1-sashal@kernel.org> MIME-Version: 1.0 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: YueHaibing [ Upstream commit b6b4dc4c1fa7f1c99398e7dc85758049645e9588 ] In xgbe_mod_init(), we should do cleanup if some error occurs Reported-by: Hulk Robot Fixes: efbaa828330a ("amd-xgbe: Add support to handle device renaming") Fixes: 47f164deab22 ("amd-xgbe: Add PCI device support") Signed-off-by: YueHaibing Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/amd/xgbe/xgbe-main.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-main.c b/drivers/net/ethernet/amd/xgbe/xgbe-main.c index b41f23679a087..7ce9c69e9c44f 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -469,13 +469,19 @@ static int __init xgbe_mod_init(void) ret = xgbe_platform_init(); if (ret) - return ret; + goto err_platform_init; ret = xgbe_pci_init(); if (ret) - return ret; + goto err_pci_init; return 0; + +err_pci_init: + xgbe_platform_exit(); +err_platform_init: + unregister_netdevice_notifier(&xgbe_netdev_notifier); + return ret; } static void __exit xgbe_mod_exit(void) -- 2.20.1