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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,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 975B0C33CB7 for ; Thu, 16 Jan 2020 18:25:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6BE172051A for ; Thu, 16 Jan 2020 18:25:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579199138; bh=wU6xElxbmamYvCcL2cdheUUez3EvA/zpL6bgRVJJj/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ahYUSHchc3EbQBkPJSjz6Ouhpp9uFRmt8McSiZ3OX+RlSQiTMM3eajbsZoUSKMCPc QZAkWpGySH7GVauj4bWrM5p9Rxjlu1ef07yMLdcvEL1LiUaET9N4e25vF7rdUObvlI UwGJwDkwu2JCYpSVWy+AYmg57Sxo2W6nGUH+RAxQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391266AbgAPSZg (ORCPT ); Thu, 16 Jan 2020 13:25:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:36304 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392359AbgAPR06 (ORCPT ); Thu, 16 Jan 2020 12:26:58 -0500 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 2AEFB246BE; Thu, 16 Jan 2020 17:26:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579195618; bh=wU6xElxbmamYvCcL2cdheUUez3EvA/zpL6bgRVJJj/Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TCAG5qqgC+xB6as6qQDNEN/tou40Qvq4Z69HbTjITzazFSQtif1/6yYQ5hSIZ031e m7W1thSxga6Ayp2Uf50eHvhVdGBlraLgOCBhoGU6Rvs5ut+Q7bFGJx4hH+iQy4sQcM Q1NyoclawrArIBew6Vhl/qvkRDAp1cwAf40KJFqs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Parav Pandit , Cornelia Huck , Kirti Wankhede , Maxim Levitsky , Alex Williamson , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 190/371] vfio/mdev: Avoid release parent reference during error path Date: Thu, 16 Jan 2020 12:21:02 -0500 Message-Id: <20200116172403.18149-133-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116172403.18149-1-sashal@kernel.org> References: <20200116172403.18149-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Parav Pandit [ Upstream commit 60e7f2c3fe9919cee9534b422865eed49f4efb15 ] During mdev parent registration in mdev_register_device(), if parent device is duplicate, it releases the reference of existing parent device. This is incorrect. Existing parent device should not be touched. Fixes: 7b96953bc640 ("vfio: Mediated device Core driver") Reviewed-by: Cornelia Huck Reviewed-by: Kirti Wankhede Reviewed-by: Maxim Levitsky Signed-off-by: Parav Pandit Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/mdev/mdev_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/vfio/mdev/mdev_core.c b/drivers/vfio/mdev/mdev_core.c index 0212f0ee8aea..8cfa71230877 100644 --- a/drivers/vfio/mdev/mdev_core.c +++ b/drivers/vfio/mdev/mdev_core.c @@ -182,6 +182,7 @@ int mdev_register_device(struct device *dev, const struct mdev_parent_ops *ops) /* Check for duplicate */ parent = __find_parent_device(dev); if (parent) { + parent = NULL; ret = -EEXIST; goto add_dev_err; } -- 2.20.1