Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 877a202f authored by Aditya Pakki's avatar Aditya Pakki Committed by Greg Kroah-Hartman
Browse files

thunderbolt: Fix to check return value of ida_simple_get 



[ Upstream commit 9aabb68568b473bf2f0b179d053b403961e42e4d ]

In enumerate_services, ida_simple_get on failure can return an error and
leaks memory. The patch ensures that the dev_set_name is set on non
failure cases, and releases memory during failure.

Signed-off-by: default avatarAditya Pakki <pakki001@umn.edu>
Signed-off-by: default avatarMika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent b9291078

drivers/thunderbolt/xdomain.c

+7 −1
Original line number Diff line number Diff line
@@ -743,6 +743,7 @@ static void enumerate_services(struct tb_xdomain *xd) 
	struct tb_service *svc;

	struct tb_property *p;

	struct device *dev;

	int id;



	/*

	 * First remove all services that are not available anymore in
@@ -771,7 +772,12 @@ static void enumerate_services(struct tb_xdomain *xd) 
			break;

		}



		svc->id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL);

		id = ida_simple_get(&xd->service_ids, 0, 0, GFP_KERNEL);

		if (id < 0) {

			kfree(svc);

			break;

		}

		svc->id = id;

		svc->dev.bus = &tb_bus_type;

		svc->dev.type = &tb_service_type;

		svc->dev.parent = &xd->dev;