Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1307433

Re: [patch] mdio_bus: NULL dereference on allocation error

Show all headers | View raw

On Tue, Jan 12, 2016 at 12:34:36PM +0300, Dan Carpenter wrote:
> If bus = kzalloc() fails then we end up dereferencing bus when we do
> "bus->irq[i] = PHY_POLL;".  The code is a little simpler if we reverse
> the NULL check and return directly on failure.
> 
> Fixes: e7f4dc3536a4 ('mdio: Move allocation of interrupts into core')
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Thanks
	Andrew

> 
> diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
> index 0be7b3d..0cba64f 100644
> --- a/drivers/net/phy/mdio_bus.c
> +++ b/drivers/net/phy/mdio_bus.c
> @@ -102,11 +102,12 @@ struct mii_bus *mdiobus_alloc_size(size_t size)
>  		alloc_size = sizeof(*bus);
>  
>  	bus = kzalloc(alloc_size, GFP_KERNEL);
> -	if (bus) {
> -		bus->state = MDIOBUS_ALLOCATED;
> -		if (size)
> -			bus->priv = (void *)bus + aligned_size;
> -	}
> +	if (!bus)
> +		return NULL;
> +
> +	bus->state = MDIOBUS_ALLOCATED;
> +	if (size)
> +		bus->priv = (void *)bus + aligned_size;
>  
>  	/* Initialise the interrupts to polling */
>  	for (i = 0; i < PHY_MAX_ADDR; i++)

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[patch] mdio_bus: NULL dereference on allocation error Dan Carpenter <dan.carpenter@oracle.com> - 2016-01-12 10:40 +0100
  Re: [patch] mdio_bus: NULL dereference on allocation error Andrew Lunn <andrew@lunn.ch> - 2016-01-12 15:10 +0100
  Re: [patch] mdio_bus: NULL dereference on allocation error David Miller <davem@davemloft.net> - 2016-01-12 20:40 +0100

csiph-web