Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-13 09:20:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Staging: ipack: returning a freed pointer

Browse Source 
If ipack_device_register() returns an error, then we returned a freed
pointer.  The caller doesn't use it, but it means we return success to
the user instead of returning an error code.

I kind of rewrote the error handling in this function as a cleanup.

Cc: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dan Carpenter 2012-05-10 18:18:36 +03:00 committed by Greg Kroah-Hartman
parent ba4dc61fe8
commit 8bdeeb26c5
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/staging/ipack/bridges/tpci200.c
View File

@ -372,7 +372,7 @@ static struct ipack_device *tpci200_slot_register(const char *board_name,
unsigned int slot_position)
{
int found = 0;
struct ipack_device *dev = NULL;
struct ipack_device *dev;
struct tpci200_board *tpci200;
list_for_each_entry(tpci200, &tpci200_list, list) {
@ -390,16 +390,16 @@ static struct ipack_device *tpci200_slot_register(const char *board_name,
if (slot_position >= TPCI200_NB_SLOT) {
pr_info("Slot [%s %d:%d] doesn't exist!\n",
TPCI200_SHORTNAME, tpci200_number, slot_position);
goto out;
return NULL;
}
if (mutex_lock_interruptible(&tpci200->mutex))
goto out;
return NULL;
if (tpci200->slots[slot_position].dev != NULL) {
pr_err("Slot [%s %d:%d] already installed !\n",
TPCI200_SHORTNAME, tpci200_number, slot_position);
goto out_unlock;
goto err_unlock;
}
dev = kzalloc(sizeof(struct ipack_device), GFP_KERNEL);
@ -407,7 +407,7 @@ static struct ipack_device *tpci200_slot_register(const char *board_name,
pr_info("Slot [%s %d:%d] Unable to allocate memory for new slot !\n",
TPCI200_SHORTNAME,
tpci200_number, slot_position);
goto out_unlock;
goto err_unlock;
}
if (size > IPACK_BOARD_NAME_SIZE) {
@ -440,15 +440,18 @@ static struct ipack_device *tpci200_slot_register(const char *board_name,
dev->ops = &tpci200_bus_ops;
tpci200->slots[slot_position].dev = dev;
if (ipack_device_register(dev) < 0) {
tpci200_slot_unregister(dev);
kfree(dev);
}
if (ipack_device_register(dev) < 0)
goto err_unregister;
out_unlock:
mutex_unlock(&tpci200->mutex);
out:
return dev;
err_unregister:
tpci200_slot_unregister(dev);
kfree(dev);
err_unlock:
mutex_unlock(&tpci200->mutex);
return NULL;
}
static ssize_t tpci200_store_board(struct device *pdev, const char *buf,