mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 23:58:05 +00:00
Code Issues Releases Wiki Activity

greybus: module: fix double free of module

Browse source 
Also properly clean up all modules when you remove a host driver

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2014-10-22 16:38:07 +08:00
parent 060b93ddbb
commit 63e4a8ee8f
2 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
drivers/staging/greybus/core.c
View file

@ -190,6 +190,13 @@ void gb_add_module(struct greybus_host_device *hd, u8 module_id,
greybus_module_release(&gmod->dev);
}
static void gb_delete_module(struct gb_module *gmod)
{
/* FIXME - tear down interfaces first */
device_del(&gmod->dev);
}
void gb_remove_module(struct greybus_host_device *hd, u8 module_id)
{
struct gb_module *gmod;
@ -202,15 +209,18 @@ void gb_remove_module(struct greybus_host_device *hd, u8 module_id)
}
if (found)
greybus_remove_device(gmod);
gb_delete_module(gmod);
else
dev_err(hd->parent, "module id %d remove error\n", module_id);
}
void greybus_remove_device(struct gb_module *gmod)
static void gb_remove_modules(struct greybus_host_device *hd)
{
device_del(&gmod->dev);
put_device(&gmod->dev);
struct gb_module *gmod, *temp;
list_for_each_entry_safe(gmod, temp, &hd->modules, links) {
gb_delete_module(gmod);
}
}
static DEFINE_MUTEX(hd_mutex);
@ -248,6 +258,7 @@ EXPORT_SYMBOL_GPL(greybus_create_hd);
void greybus_remove_hd(struct greybus_host_device *hd)
{
gb_remove_modules(hd);
kref_put_mutex(&hd->kref, free_hd, &hd_mutex);
}
EXPORT_SYMBOL_GPL(greybus_remove_hd);

2
drivers/staging/greybus/greybus.h
View file

@ -242,8 +242,6 @@ void greybus_deregister(struct greybus_driver *driver);
int greybus_disabled(void);
void greybus_remove_device(struct gb_module *gmod);
/* Internal functions to gb module, move to internal .h file eventually. */
void gb_add_module(struct greybus_host_device *hd, u8 module_id,