Commit 897f6a30 authored Nov 09, 2022 by Yang Yingliang Committed by Greg Kroah-Hartman Dec 08, 2022

tee: optee: fix possible memory leak in optee_register_device()



[ Upstream commit cce616e012c215d65c15e5d1afa73182dea49389 ]

If device_register() returns error in optee_register_device(),
the name allocated by dev_set_name() need be freed. As comment
of device_register() says, it should use put_device() to give
up the reference in the error path. So fix this by calling
put_device(), then the name can be freed in kobject_cleanup(),
and optee_device is freed in optee_release_device().

Fixes: c3fa24af ("tee: optee: add TEE bus device enumeration support")
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 9c1fbac6

drivers/tee/optee/device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -89,7 +89,7 @@ static int optee_register_device(const uuid_t *device_uuid, u32 device_id)
		rc = device_register(&optee_device->dev);
		if (rc) {
		pr_err("device registration failed, err: %d\n", rc);
		kfree(optee_device);
		put_device(&optee_device->dev);
		}

		return rc;