Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp587939iog; Mon, 13 Jun 2022 08:40:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxENmsbKzhYrVGxTqFzGMTY+5UxOn3yUnwv4JSsW7UNfjfnio7A/QMeI/x6ePZWLTalbImn X-Received: by 2002:a63:401:0:b0:3fc:8810:f0ae with SMTP id 1-20020a630401000000b003fc8810f0aemr170955pge.335.1655134814500; Mon, 13 Jun 2022 08:40:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655134814; cv=none; d=google.com; s=arc-20160816; b=OIiHVzE5bk3FIXE6DIE7+7o9ZjNiog38zShdfKY7a6dMMw1E9ZD4SPcGpLkF0vPhO5 SQjrOMSH0ChlyL66Z9fLRG1E8Pl2HOzrStmukiBBWEr8Bw0+8gXv6CcBZrlp8T3fWMM4 d6HP9DkjcvPxvoOeFcDVNcrapZG5QQXmM4e2UOiD1tWL6XuH6GL8qIYWinrF/IWNPvD9 KoAVo/xeKXZcGeSPONNlYVzpDmXJFa7ShISiFabsWlFRDhiqn3Klw2t2LCi8uMwVWpbx Hh263riHu6eT8S5P1D2asmDy+K6E+yw5aCwkbf8wKWMYVT4qIapfJvsRt0KgkQO68mrg 1gwg== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=giX8etvci8zA0FjokgddH4KCWWCqk9xaonTTYE56isU=; b=fEEwDZmqJg698vcJW8VuKMXrA2zsVeZLSqcdaA/8V6TjBWQHD9V44LNzYyjPoc/Ml4 uUlAc08ueJ45U9EgYF4FTdBwQGk5IkeLhB3MncB6PWUm8Ze29yPMKoXS3oPscaOpEebh a1MOVLbKwzv9LEI3MmqGc6UAD5lnHHXnaS+TjxuFuZ15TEIbP7UMgiUI0Uz7gowNejDt +5NYbpsozkEkhKz36hQpCeKvvL1KvC9DZKnnSbGu3OyyL6co6ap7pFsfBypYJuj/LNbk 5Szt8F+t++niq6mdWQXN4UJmiuOoG6ivmvBQHNqIGWwVp8y0H9A3bPNJhATIYtnNHbCK hI3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NSY+4BoB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id t11-20020a17090340cb00b0015838c0eedbsi8960465pld.506.2022.06.13.08.40.01; Mon, 13 Jun 2022 08:40:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NSY+4BoB; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358810AbiFMNHu (ORCPT + 99 others); Mon, 13 Jun 2022 09:07:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50422 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239217AbiFMMzV (ORCPT ); Mon, 13 Jun 2022 08:55:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 907A6DFC8; Mon, 13 Jun 2022 04:16:05 -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 2D03960B6B; Mon, 13 Jun 2022 11:16:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EC9CC34114; Mon, 13 Jun 2022 11:16:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655118964; bh=JvD0aaCdi1KOqBVa71WtDHZ7Uwi3CKeJnRuEToyDQoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NSY+4BoBgiy4QEgqIVM31+s8wvW39iIxqkg2EkaQMGaAqkgwO4vr6a0tEC4myczHX jvs5YWV9stRx2BLpuJ95FhYAH6+Fz4GPECt3cwuGqmzefOlvBxmqcn0I6FsEaR+cdB 18tLvjph9UnjvxnMTVnPS3SvEUv2wT8lRNQpHkEM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christophe JAILLET , "Michael S. Tsirkin" , Sasha Levin Subject: [PATCH 5.15 092/247] virtio: pci: Fix an error handling path in vp_modern_probe() Date: Mon, 13 Jun 2022 12:09:54 +0200 Message-Id: <20220613094925.747641168@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220613094922.843438024@linuxfoundation.org> References: <20220613094922.843438024@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham 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: Christophe JAILLET [ Upstream commit 7a836a2aba09479c8e71fa43249eecc4af945f61 ] If an error occurs after a successful pci_request_selected_regions() call, it should be undone by a corresponding pci_release_selected_regions() call, as already done in vp_modern_remove(). Fixes: fd502729fbbf ("virtio-pci: introduce modern device module") Signed-off-by: Christophe JAILLET Message-Id: <237109725aad2c3c03d14549f777b1927c84b045.1648977064.git.christophe.jaillet@wanadoo.fr> Signed-off-by: Michael S. Tsirkin Signed-off-by: Sasha Levin --- drivers/virtio/virtio_pci_modern_dev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/virtio/virtio_pci_modern_dev.c b/drivers/virtio/virtio_pci_modern_dev.c index e11ed748e661..9ab66e44738e 100644 --- a/drivers/virtio/virtio_pci_modern_dev.c +++ b/drivers/virtio/virtio_pci_modern_dev.c @@ -340,6 +340,7 @@ int vp_modern_probe(struct virtio_pci_modern_device *mdev) err_map_isr: pci_iounmap(pci_dev, mdev->common); err_map_common: + pci_release_selected_regions(pci_dev, mdev->modern_bars); return err; } EXPORT_SYMBOL_GPL(vp_modern_probe); -- 2.35.1