Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp6185ybt; Tue, 23 Jun 2020 13:48:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzC+6tQPy/Ypy5kh7EulceqrEbhUO4bKZU05bVWi6VY5dTHE07xu5B1I1aXV3O4Xb13DGUn X-Received: by 2002:a50:b2c2:: with SMTP id p60mr14305716edd.374.1592945337127; Tue, 23 Jun 2020 13:48:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592945337; cv=none; d=google.com; s=arc-20160816; b=x3aPbl7BZTqo5KV30qRtfFU4SxQs+s9KUs5Hjl0EMz5O4kYjpWET54FklRNdQLAyBv 7I4dNclFZn/cTuKmbUOmC8JUH7kR2K3oyBS/lQEllLZrtW5558uGlxAjTzk6wurpmETJ nXp2beyc+vvVgWEwVuCcVzMMkbU5M8/g7eAOq0lsWfXZs7xksvKo3kWUmSXYrdHAgNDH bcU4jZWbYDtDt5H8o/STQhJjJXDKnkIg3hO2dHLZeuaLS7rAUMmJwdNU/8+pRRjOQV8k qDFnmCsKb98cDvsOKxb5yfvq9olSRBd+RlJIfkxOK13YC8mbAMO9z77/ghqcDL9h8jPD fubQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=t1LD6cWwX8fDELcr9tUcVUIl9q0FFmjuY31GYeW7PQY=; b=Ex4zIGKC5/giBSVSRWp6HOgPeaKCEvxisJGNhgrRpifxkILdmvCbBTHB32oi1HTQrk Katx6RKLsM0PnGJpjn8lcIQsCVx+oe4GVK1hCBruBMt1CsUV/En7icNrFlWuO9O63555 tpI6aW4Y+lrjTYSm0PxXWR9RFsuSpzgOz7I6O74h25O6PNAPDhcqe178gE8czxO/o9Pd Ru+3A4GSk/ICJelSUClBp1C988SO2JhT5tHs3Q+5D2g5pO+SUm3EOCHiTubIJcuSFcb1 q37dThrwOE2GiNDSXRlY5JoyoPhkkSy+2yhM49leKk4wjqueYU0Iz0IEbLiWLVZJEhCJ A5QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1UyGcd7T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id nh4si11479981ejb.339.2020.06.23.13.48.34; Tue, 23 Jun 2020 13:48:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1UyGcd7T; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404040AbgFWUrL (ORCPT + 99 others); Tue, 23 Jun 2020 16:47:11 -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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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