Commit 4ecc8c06 authored by Julia Lawall's avatar Julia Lawall Committed by Jeff Garzik

drivers/net/fs_enet: remove null pointer dereference

The following code appears in the function fs_init_instance in the file drivers/net/fs_enet/fs_enet-main.c.

	if (fep->ops == NULL) {
		printk(KERN_ERR DRV_MODULE_NAME
		       ": %s No matching ops found (%d).\n",
		       ndev->name, fpi->fs_no);
		err = -EINVAL;
		goto err;
	}

This code implies that at the point of err, fep->ops can be NULL, so an
extra test is needed before dereferencing this value.

This problem was found using the following semantic match
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@@
expression E, E1;
identifier f;
statement S1,S2,S3;
@@

* if (E == NULL)
{
  ... when != if (E == NULL) S1 else S2
      when != E = E1
* E->f
  ... when any
  return ...;
}
else S3
// </smpl>
Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 0b5923cd
...@@ -1093,7 +1093,7 @@ static struct net_device *fs_init_instance(struct device *dev, ...@@ -1093,7 +1093,7 @@ static struct net_device *fs_init_instance(struct device *dev,
if (registered) if (registered)
unregister_netdev(ndev); unregister_netdev(ndev);
if (fep != NULL) { if (fep && fep->ops) {
(*fep->ops->free_bd)(ndev); (*fep->ops->free_bd)(ndev);
(*fep->ops->cleanup_data)(ndev); (*fep->ops->cleanup_data)(ndev);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment