Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-26 22:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

greybus: svc: fix ida memory leak

Browse Source 
The device-id map was never deallocated on SVC-connection tear down.

Also make the map per-SVC-connection (there should still be only one)
rather than use a global pointer.

Reviewed-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Johan Hovold 2015-09-15 09:18:08 +02:00 committed by Greg Kroah-Hartman
parent e5acf736ca
commit c09db1820f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/greybus/svc.c
View File

@ -24,6 +24,7 @@ enum gb_svc_state {
struct gb_svc {
struct gb_connection *connection;
enum gb_svc_state state;
struct ida device_id_map;
};
struct svc_hotplug {
@ -32,7 +33,6 @@ struct svc_hotplug {
struct gb_svc_intf_hotplug_request data;
};
static struct ida greybus_svc_device_id_map;
/*
* AP's SVC cport is required early to get messages from the SVC. This happens
@ -369,7 +369,7 @@ static void svc_process_hotplug(struct work_struct *work)
* XXX Do we need to allocate device ID for SVC or the AP here? And what
* XXX about an AP with multiple interface blocks?
*/
device_id = ida_simple_get(&greybus_svc_device_id_map,
device_id = ida_simple_get(&svc->device_id_map,
GB_DEVICE_ID_MODULES_START, 0, GFP_KERNEL);
if (device_id < 0) {
ret = device_id;
@ -413,7 +413,7 @@ svc_id_free:
* XXX anymore.
*/
ida_put:
ida_simple_remove(&greybus_svc_device_id_map, device_id);
ida_simple_remove(&svc->device_id_map, device_id);
destroy_interface:
gb_interface_remove(hd, intf_id);
free_svc_hotplug:
@ -490,7 +490,7 @@ static int gb_svc_intf_hot_unplug_recv(struct gb_operation *op)
*/
gb_svc_route_destroy(svc, hd->endo->ap_intf_id, intf_id);
ida_simple_remove(&greybus_svc_device_id_map, device_id);
ida_simple_remove(&svc->device_id_map, device_id);
return 0;
}
@ -594,7 +594,7 @@ static int gb_svc_connection_init(struct gb_connection *connection)
WARN_ON(connection->hd->initial_svc_connection);
connection->hd->initial_svc_connection = connection;
ida_init(&greybus_svc_device_id_map);
ida_init(&svc->device_id_map);
return 0;
}
@ -603,6 +603,7 @@ static void gb_svc_connection_exit(struct gb_connection *connection)
{
struct gb_svc *svc = connection->private;
ida_destroy(&svc->device_id_map);
connection->hd->svc = NULL;
connection->private = NULL;
kfree(svc);