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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 F36FDC3A5A6 for ; Thu, 19 Sep 2019 22:29:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BDA6220678 for ; Thu, 19 Sep 2019 22:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568932192; bh=PAUG5iixFXxTPmQ6sxSR0YC0MClEKtce7SpzYuzozrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=j3vLR2RJ5mpc+7hAIG2SafJlxKKNl5jOep5bSW+BVJM3sU1Ihhuu21X8xuVrXG3Qb ihYlj7flbKdNtsGi9p5lgJZVeLRFRqi5GLaVTBxLiubGcFljomf76aD4o6Q8ab23i0 3wlWXZryYdXXVxEPoIkq4g1f0LF0KUTnsALISwvQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406439AbfISWRL (ORCPT ); Thu, 19 Sep 2019 18:17:11 -0400 Received: from mail.kernel.org ([198.145.29.99]:58126 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406426AbfISWRG (ORCPT ); Thu, 19 Sep 2019 18:17:06 -0400 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 76A6121907; Thu, 19 Sep 2019 22:17:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1568931426; bh=PAUG5iixFXxTPmQ6sxSR0YC0MClEKtce7SpzYuzozrE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pZI1DByGbp14iWN63d92vZ+hFdHVvGJPS+LMmsJT1edsn8Pbz177YT+f4aFa04ZTM IAAhM98v9Pii/FaPrlEOJemRccd31iBPXGO+LLnMTUGWAt0JMo0utyrwl7BLM/shxl alkOSCt0iEBzlSWY/+pBedczOBErklwVUX5Cndic= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hulk Robot , YueHaibing , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 42/59] amd-xgbe: Fix error path in xgbe_mod_init() Date: Fri, 20 Sep 2019 00:03:57 +0200 Message-Id: <20190919214807.076319117@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190919214755.852282682@linuxfoundation.org> References: <20190919214755.852282682@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: 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 e31d9d1fb6a66..e4e632e025d31 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-main.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-main.c @@ -487,13 +487,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