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,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 4A1BEC433E1 for ; Thu, 18 Jun 2020 01:48:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1D6AB221F7 for ; Thu, 18 Jun 2020 01:48:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592444924; bh=kfumCbCRBNBMv65SENjTVAsvXjAh+EuIfOHq0R3kI4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=dvBCQ8oDgCblnJPineh+XNSc/m6ldf2WNoHNE/tndGfrp/4NSltCuzy5Vm3/FBti4 l1JB9M8AcbgnlwQjuSBjTxM5J1QpHrrr8wJ61BU+6KbEHNJa7sNET+vEDbSreocV4b zdRBD9uywDbaFB+h1jKIdxs8cGCWwirGmScEtjPo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732645AbgFRBsg (ORCPT ); Wed, 17 Jun 2020 21:48:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:36200 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731968AbgFRB1v (ORCPT ); Wed, 17 Jun 2020 21:27:51 -0400 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 25C49221FC; Thu, 18 Jun 2020 01:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592443671; bh=kfumCbCRBNBMv65SENjTVAsvXjAh+EuIfOHq0R3kI4w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0UpKGRF12kHMsCiXnkwrHB+CAOW6i5cWTLBgi3Pwl2YJArO+RgVCOrtCD3WRYWmNk 1rYqUudeGKnjpD2IDHoywnhV49va/j9e816uDybK2HH8yPHNmXMHj7c2Wh3xK+HQ0S dmMdfz30r/BViRdk/koOvW6uaZyV/aeVlVY5WHVE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qiushi Wu , Cornelia Huck , Kirti Wankhede , Alex Williamson , Sasha Levin , kvm@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 087/108] vfio/mdev: Fix reference count leak in add_mdev_supported_type Date: Wed, 17 Jun 2020 21:25:39 -0400 Message-Id: <20200618012600.608744-87-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618012600.608744-1-sashal@kernel.org> References: <20200618012600.608744-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: Qiushi Wu [ Upstream commit aa8ba13cae3134b8ef1c1b6879f66372531da738 ] kobject_init_and_add() takes reference even when it fails. If this function returns an error, kobject_put() must be called to properly clean up the memory associated with the object. Thus, replace kfree() by kobject_put() to fix this issue. Previous commit "b8eb718348b8" fixed a similar problem. Fixes: 7b96953bc640 ("vfio: Mediated device Core driver") Signed-off-by: Qiushi Wu Reviewed-by: Cornelia Huck Reviewed-by: Kirti Wankhede Signed-off-by: Alex Williamson Signed-off-by: Sasha Levin --- drivers/vfio/mdev/mdev_sysfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/vfio/mdev/mdev_sysfs.c b/drivers/vfio/mdev/mdev_sysfs.c index 802df210929b..7e474e41c85e 100644 --- a/drivers/vfio/mdev/mdev_sysfs.c +++ b/drivers/vfio/mdev/mdev_sysfs.c @@ -113,7 +113,7 @@ struct mdev_type *add_mdev_supported_type(struct mdev_parent *parent, "%s-%s", dev_driver_string(parent->dev), group->name); if (ret) { - kfree(type); + kobject_put(&type->kobj); return ERR_PTR(ret); } -- 2.25.1