Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        "stable@vger.kernel.org" <stable@vger.kernel.org>
CC:     Yong Zhao <yong.zhao@amd.com>,
        Felix Kuehling <Felix.Kuehling@amd.com>,
        Oded Gabbay <oded.gabbay@gmail.com>,
        Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL for 4.4 108/115] drm/amdkfd: Fix memory leaks in kfd
 topology
Thread-Topic: [PATCH AUTOSEL for 4.4 108/115] drm/amdkfd: Fix memory leaks in
 kfd topology
Thread-Index: AQHTsz9u8gCgM0A+WEGGnmGDqJiqTw==
Date:   Sat, 3 Mar 2018 22:31:54 +0000
Message-ID: <20180303223010.27106-108-alexander.levin@microsoft.com>
References: <20180303223010.27106-1-alexander.levin@microsoft.com>
In-Reply-To: <20180303223010.27106-1-alexander.levin@microsoft.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 9efe3d19-2556-486a-3508-08d58157d0c8
X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Mar 2018 22:31:54.0270
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHSPR01MB344
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Yong Zhao <yong.zhao@amd.com>

[ Upstream commit 5108d768408abc80e4e8d99f5b406a73cb04056b ]

Kobject created using kobject_create_and_add() can be freed using
kobject_put() when there is no referenece any more. However,
kobject memory allocated with kzalloc() has to set up a release
callback in order to free it when the counter decreases to 0.
Otherwise it causes memory leak.

Signed-off-by: Yong Zhao <yong.zhao@amd.com>
Signed-off-by: Felix Kuehling <Felix.Kuehling@amd.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c b/drivers/gpu/drm/am=
d/amdkfd/kfd_topology.c
index 74909e72a009..2acbd43f9a53 100644
--- a/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_topology.c
@@ -519,11 +519,17 @@ static ssize_t sysprops_show(struct kobject *kobj, st=
ruct attribute *attr,
 	return ret;
 }
=20
+static void kfd_topology_kobj_release(struct kobject *kobj)
+{
+	kfree(kobj);
+}
+
 static const struct sysfs_ops sysprops_ops =3D {
 	.show =3D sysprops_show,
 };
=20
 static struct kobj_type sysprops_type =3D {
+	.release =3D kfd_topology_kobj_release,
 	.sysfs_ops =3D &sysprops_ops,
 };
=20
@@ -559,6 +565,7 @@ static const struct sysfs_ops iolink_ops =3D {
 };
=20
 static struct kobj_type iolink_type =3D {
+	.release =3D kfd_topology_kobj_release,
 	.sysfs_ops =3D &iolink_ops,
 };
=20
@@ -586,6 +593,7 @@ static const struct sysfs_ops mem_ops =3D {
 };
=20
 static struct kobj_type mem_type =3D {
+	.release =3D kfd_topology_kobj_release,
 	.sysfs_ops =3D &mem_ops,
 };
=20
@@ -625,6 +633,7 @@ static const struct sysfs_ops cache_ops =3D {
 };
=20
 static struct kobj_type cache_type =3D {
+	.release =3D kfd_topology_kobj_release,
 	.sysfs_ops =3D &cache_ops,
 };
=20
@@ -747,6 +756,7 @@ static const struct sysfs_ops node_ops =3D {
 };
=20
 static struct kobj_type node_type =3D {
+	.release =3D kfd_topology_kobj_release,
 	.sysfs_ops =3D &node_ops,
 };
=20
--=20
2.14.1