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

net: ethoc: Fix early error paths

Browse Source 
In case any operation fails before we can successfully go the point
where we would register a MDIO bus, we would be going to an error label
which involves unregistering then freeing this yet to be created MDIO
bus. Update all error paths to go to label free which is the only one
valid until either the clock is enabled, or the MDIO bus is allocated
and registered. This fixes kernel oops observed while trying to
dereference the MDIO bus structure which is not yet allocated.

Fixes: a170285772 ("net: Add support for the OpenCores 10/100 Mbps Ethernet MAC.")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2016-07-12 16:04:35 -07:00 committed by David S. Miller
parent 136ab0d0e1
commit 386512d18b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/ethoc.c
View File

@ -1086,7 +1086,7 @@ static int ethoc_probe(struct platform_device *pdev)
if (!priv->iobase) { if (!priv->iobase) {
dev_err(&pdev->dev, "cannot remap I/O memory space\n"); dev_err(&pdev->dev, "cannot remap I/O memory space\n");
ret = -ENXIO; ret = -ENXIO;
goto error; goto free;
} }
if (netdev->mem_end) { if (netdev->mem_end) {
@ -1095,7 +1095,7 @@ static int ethoc_probe(struct platform_device *pdev)
if (!priv->membase) { if (!priv->membase) {
dev_err(&pdev->dev, "cannot remap memory space\n"); dev_err(&pdev->dev, "cannot remap memory space\n");
ret = -ENXIO; ret = -ENXIO;
goto error; goto free;
} }
} else { } else {
/* Allocate buffer memory */ /* Allocate buffer memory */
@ -1106,7 +1106,7 @@ static int ethoc_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "cannot allocate %dB buffer\n", dev_err(&pdev->dev, "cannot allocate %dB buffer\n",
buffer_size); buffer_size);
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto free;
} }
netdev->mem_end = netdev->mem_start + buffer_size; netdev->mem_end = netdev->mem_start + buffer_size;
priv->dma_alloc = buffer_size; priv->dma_alloc = buffer_size;
@ -1120,7 +1120,7 @@ static int ethoc_probe(struct platform_device *pdev)
128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ); 128, (netdev->mem_end - netdev->mem_start + 1) / ETHOC_BUFSIZ);
if (num_bd < 4) { if (num_bd < 4) {
ret = -ENODEV; ret = -ENODEV;
goto error; goto free;
} }
priv->num_bd = num_bd; priv->num_bd = num_bd;
/* num_tx must be a power of two */ /* num_tx must be a power of two */
@ -1133,7 +1133,7 @@ static int ethoc_probe(struct platform_device *pdev)
priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void *), GFP_KERNEL); priv->vma = devm_kzalloc(&pdev->dev, num_bd*sizeof(void *), GFP_KERNEL);
if (!priv->vma) { if (!priv->vma) {
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto free;
} }
/* Allow the platform setup code to pass in a MAC address. */ /* Allow the platform setup code to pass in a MAC address. */