Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp432205iob; Wed, 18 May 2022 05:30:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyKZ8yD3xy9pFJh5899/4dOgVB2vcuTwDymDn46dbsMQh+FVnOs1aJ+KNQjc9TzgUGqIuUl X-Received: by 2002:a17:902:7d93:b0:14d:d401:f59b with SMTP id a19-20020a1709027d9300b0014dd401f59bmr27772308plm.14.1652877000490; Wed, 18 May 2022 05:30:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652877000; cv=none; d=google.com; s=arc-20160816; b=CwVPAMIMNMhge2iVcJrIC0nMLlIecnZKASSG69rtKp/pzJduTRRit3A7ZskWu+ltQD iwX1hfnYXcbndxw78O6NKdwbTUWfdW+G0us23BNwHm+3T291nwVrcmk0nwS7qZhD37Ii emlQNXjXBxrjB9F/0AAyPxHGSvdgt5Oakc/7VzsuHs9uR5prkors/V4f6z/XjTnV4Nyj g/gP+VzjPYdEpoLGc2MZerab3b9YgcOOmAQ9uHhDqMm/SAuI0pMPTkQi6smcnsv4JUG8 QHw4m+iA/+ivMXcvZDFDZi2brW8h5zRSiiAVzmgxv3x2FSVwyTp7fEKhGzL/ZJm4L7P7 mI4g== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UdSh4TgTsOwsdacUAnsVUMQn4p+vImPkSr6xoHeJtF0=; b=B8eNMpDcAfnLhGWDsaYVv8XgUa4TM/b+o/9Mk32/GOAek9xES1vpmwkGpiAgSC0E+P Gpv2fRld4Qd3rIU77TF7Sy/uF2hI5vSQSHXl0iNX6Ll7lVMEacC+LGp4uo0Cxbl68Xhr Y/gwkztT+qveaJ8Wdxn5YA6XQHUlnjxzz8FZmPVqu0AsZgrBbnT0sOK4XriVxfxsKx6n ytk/7GtN/VYaLV5wO9nTyfJyz4p0A1HVR+kIPyYdxupH1bq18voWtIFOEbBFraqnLKhQ QGfDkIuGHQAWjY6vVPElSAnOqzPSe2TafpnA5OXiq5FMDaBDkAR7onXtCeY7ohGJnENb 1nhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KSFEGvJr; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [23.128.96.19]) by mx.google.com with ESMTPS id ko18-20020a17090b171200b001c7511dc330si5939470pjb.167.2022.05.18.05.30.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 05:30:00 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) client-ip=23.128.96.19; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KSFEGvJr; spf=softfail (google.com: domain of transitioning linux-kernel-owner@vger.kernel.org does not designate 23.128.96.19 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2598D16D5C5; Wed, 18 May 2022 05:29:20 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236589AbiERM21 (ORCPT + 99 others); Wed, 18 May 2022 08:28:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236583AbiERM1c (ORCPT ); Wed, 18 May 2022 08:27:32 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7E48108A8C; Wed, 18 May 2022 05:27:30 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6349B61290; Wed, 18 May 2022 12:27:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B30CC34118; Wed, 18 May 2022 12:27:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1652876849; bh=3ttDH7Ouwvsv4SWQiq9osTp1Ju2Kv4XBmQr9tWoCqqQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KSFEGvJrCcXDf9fV9MclgvZ22p+7Go60Zmv6mb6ZBkzR9sxrId9jVw1456XCc3Slw BaRX7dB4Lzz4wwOCHZTQJytwKVFxB17YMvVN94/eSqVGLNTLvbK5b5LpdosH8kibbu E4Oe824dN7sPC/6j5nbMmr/rd8iYO2Y4jEJ9ceDfftuikDBXYYPdW2Qd/LH/zbzydv o48I5son5ROVvgl5g4QJgEhD1GAKMpzpLoJ+hc0ZU0w5vFs39YmbFqoSTQFApxfr5r PK0g6E0c3L7AXHtEM6R11bZMbg8zbjhRzUbePZNliPC3uK/+GDjKARJpJAPeacC8B1 5ocTW4MYJOSyw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Yang Yingliang , Hulk Robot , Jakub Kicinski , Sasha Levin , davem@davemloft.net, edumazet@google.com, pabeni@redhat.com, arnd@arndb.de, jgg@ziepe.ca, netdev@vger.kernel.org, linux-parisc@vger.kernel.org Subject: [PATCH AUTOSEL 5.17 16/23] ethernet: tulip: fix missing pci_disable_device() on error in tulip_init_one() Date: Wed, 18 May 2022 08:26:29 -0400 Message-Id: <20220518122641.342120-16-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220518122641.342120-1-sashal@kernel.org> References: <20220518122641.342120-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RDNS_NONE,SPF_HELO_NONE,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 From: Yang Yingliang [ Upstream commit 51ca86b4c9c7c75f5630fa0dbe5f8f0bd98e3c3e ] Fix the missing pci_disable_device() before return from tulip_init_one() in the error handling case. Reported-by: Hulk Robot Signed-off-by: Yang Yingliang Link: https://lore.kernel.org/r/20220506094250.3630615-1-yangyingliang@huawei.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- drivers/net/ethernet/dec/tulip/tulip_core.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/dec/tulip/tulip_core.c b/drivers/net/ethernet/dec/tulip/tulip_core.c index 79df5a72877b..0040dcaab945 100644 --- a/drivers/net/ethernet/dec/tulip/tulip_core.c +++ b/drivers/net/ethernet/dec/tulip/tulip_core.c @@ -1399,8 +1399,10 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* alloc_etherdev ensures aligned and zeroed private structures */ dev = alloc_etherdev (sizeof (*tp)); - if (!dev) + if (!dev) { + pci_disable_device(pdev); return -ENOMEM; + } SET_NETDEV_DEV(dev, &pdev->dev); if (pci_resource_len (pdev, 0) < tulip_tbl[chip_idx].io_size) { @@ -1785,6 +1787,7 @@ static int tulip_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) err_out_free_netdev: free_netdev (dev); + pci_disable_device(pdev); return -ENODEV; } -- 2.35.1