leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/fsl_rio: Add kmalloc NULL tests

Browse Source 
Check that the result of kmalloc/kzalloc is not NULL before dereferencing it.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression *x;
identifier f;
constant char *C;
@@

x = \(kmalloc\|kcalloc\|kzalloc\)(...);
... when != x == NULL
    when != x != NULL
    when != (x || ...)
(
kfree(x)
|
f(...,C,...,x,...)
|
*f(...,x,...)
|
*x->f
)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Julia Lawall 2009-08-07 09:00:34 +02:00 committed by Benjamin Herrenschmidt
parent 8dcd038a13
commit 6c75933c00
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/powerpc/sysdev/fsl_rio.c
View File

@ -1057,6 +1057,10 @@ int fsl_rio_setup(struct of_device *dev)
law_start, law_size); law_start, law_size);
ops = kmalloc(sizeof(struct rio_ops), GFP_KERNEL); ops = kmalloc(sizeof(struct rio_ops), GFP_KERNEL);
if (!ops) {
rc = -ENOMEM;
goto err_ops;
}
ops->lcread = fsl_local_config_read; ops->lcread = fsl_local_config_read;
ops->lcwrite = fsl_local_config_write; ops->lcwrite = fsl_local_config_write;
ops->cread = fsl_rio_config_read; ops->cread = fsl_rio_config_read;
@ -1064,6 +1068,10 @@ int fsl_rio_setup(struct of_device *dev)
ops->dsend = fsl_rio_doorbell_send; ops->dsend = fsl_rio_doorbell_send;
port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL); port = kzalloc(sizeof(struct rio_mport), GFP_KERNEL);
if (!port) {
rc = -ENOMEM;
goto err_port;
}
port->id = 0; port->id = 0;
port->index = 0; port->index = 0;
@ -1071,7 +1079,7 @@ int fsl_rio_setup(struct of_device *dev)
if (!priv) { if (!priv) {
printk(KERN_ERR "Can't alloc memory for 'priv'\n"); printk(KERN_ERR "Can't alloc memory for 'priv'\n");
rc = -ENOMEM; rc = -ENOMEM;
goto err; goto err_priv;
} }
INIT_LIST_HEAD(&port->dbells); INIT_LIST_HEAD(&port->dbells);
@ -1169,11 +1177,13 @@ int fsl_rio_setup(struct of_device *dev)
return 0; return 0;
err: err:
if (priv) iounmap(priv->regs_win);
iounmap(priv->regs_win);
kfree(ops);
kfree(priv); kfree(priv);
err_priv:
kfree(port); kfree(port);
err_port:
kfree(ops);
err_ops:
return rc; return rc;
} }