| From 3827ab496cf2b3af0f8c341e31645a96280d9569 Mon Sep 17 00:00:00 2001 |
| From: Aditya Pakki <pakki001@umn.edu> |
| Date: Wed, 20 Mar 2019 11:34:09 -0500 |
| Subject: 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: Aditya Pakki <pakki001@umn.edu> |
| Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/thunderbolt/xdomain.c | 8 +++++++- |
| 1 file changed, 7 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/thunderbolt/xdomain.c b/drivers/thunderbolt/xdomain.c |
| index e27dd8beb94be..e0642dcb8b9bd 100644 |
| --- a/drivers/thunderbolt/xdomain.c |
| +++ b/drivers/thunderbolt/xdomain.c |
| @@ -740,6 +740,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 |
| @@ -768,7 +769,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; |
| -- |
| 2.20.1 |
| |