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,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 1B068C17441 for ; Mon, 11 Nov 2019 19:03:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBBA0222CE for ; Mon, 11 Nov 2019 19:03:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573498993; bh=Cy38CBA9w5CE8lj9VSGlg26w/40zREJw3/30CScJPXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=srWsR7VMPJcwqOZTy9UjwYGDaZO3lNRpl2kuD4PgBQfbvpS8CyapOfL6X8FfOdmOX WSWiSxKnpJEqQYquI2yBpIVxoi/kKx8CoqNZzyRw5sH8ucHxF0WCzuGpe6noC5cmvm Qsoo7xtGHHrMlgbPAKElTWOAlRnI2+/dq6xWOi3Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728823AbfKKSqU (ORCPT ); Mon, 11 Nov 2019 13:46:20 -0500 Received: from mail.kernel.org ([198.145.29.99]:38756 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729984AbfKKSqS (ORCPT ); Mon, 11 Nov 2019 13:46:18 -0500 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 52E3921655; Mon, 11 Nov 2019 18:46:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573497977; bh=Cy38CBA9w5CE8lj9VSGlg26w/40zREJw3/30CScJPXw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tHWchNXDT3MTFeHcYATqeHfYmNKPa95BdsRBIBUyImhwEJIaBNI7zL1dCr1XxN9bn gT/zYdBip8QmyRD3iA3vjI+5sZOIb3cjI4huKjeQ4n04o0JbVkNVzzP9VzEHttsClN 2Hvu3vJh7yZgh5rZ9vLfTfzL8oxS0n6GF+zfBvLE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Haiyang Zhang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.19 112/125] hv_netvsc: Fix error handling in netvsc_attach() Date: Mon, 11 Nov 2019 19:29:11 +0100 Message-Id: <20191111181454.792993510@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191111181438.945353076@linuxfoundation.org> References: <20191111181438.945353076@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: Haiyang Zhang [ Upstream commit 719b85c336ed35565d0f3982269d6f684087bb00 ] If rndis_filter_open() fails, we need to remove the rndis device created in earlier steps, before returning an error code. Otherwise, the retry of netvsc_attach() from its callers will fail and hang. Fixes: 7b2ee50c0cd5 ("hv_netvsc: common detach logic") Signed-off-by: Haiyang Zhang Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/hyperv/netvsc_drv.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 6f6c0dbd91fc8..b7a71c203aa37 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -993,7 +993,7 @@ static int netvsc_attach(struct net_device *ndev, if (netif_running(ndev)) { ret = rndis_filter_open(nvdev); if (ret) - return ret; + goto err; rdev = nvdev->extension; if (!rdev->link_state) @@ -1001,6 +1001,13 @@ static int netvsc_attach(struct net_device *ndev, } return 0; + +err: + netif_device_detach(ndev); + + rndis_filter_device_remove(hdev, nvdev); + + return ret; } static int netvsc_set_channels(struct net_device *net, -- 2.20.1