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.0 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,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 E92C7C433E2 for ; Tue, 23 Jun 2020 20:53:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BCA5420702 for ; Tue, 23 Jun 2020 20:53:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945600; bh=LVnmN5aZ0vxgsQR5Wy6w1OtuTrMtIj65si1oe4t5o84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z6mphbzkqP78kFVRJwbv4qNLfMkMGwoO2YWPlTischTdT75jwzFptG92xGGq0Wqd7 DGiZDdVB3j0Mmfnxqnnfjs1BqpXviHRjDbnaoS7qsXsv4IU4VkXJ1dROPmBofygQHN i70FTBRQsdbKi+DTDQ+EBYgk4kdnB3xphwiksGDk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392888AbgFWUqy (ORCPT ); Tue, 23 Jun 2020 16:46:54 -0400 Received: from mail.kernel.org ([198.145.29.99]:45082 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2392885AbgFWUqx (ORCPT ); Tue, 23 Jun 2020 16:46:53 -0400 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 9035821548; Tue, 23 Jun 2020 20:46:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592945214; bh=LVnmN5aZ0vxgsQR5Wy6w1OtuTrMtIj65si1oe4t5o84=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1UyGcd7Tdn19S8a3Z/tiUlMvpEoykGiO165H3NXSb+PJR2ayTK34ZKBjf7acsFYnP Qm+zC1uvYNmC792dkAayUBqt2y2YIgyi82liUl9ythzmiLktVTsqC/g7/f/rehLrih +3NV3GgGy7hpiPAtuj1W0IWDY5FMfb2HvFQ4Nx+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Qiushi Wu , Cornelia Huck , Kirti Wankhede , Alex Williamson , Sasha Levin Subject: [PATCH 4.14 084/136] vfio/mdev: Fix reference count leak in add_mdev_supported_type Date: Tue, 23 Jun 2020 21:59:00 +0200 Message-Id: <20200623195307.916629785@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200623195303.601828702@linuxfoundation.org> References: <20200623195303.601828702@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: 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 802df210929ba..7e474e41c85e3 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