Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: mdio-octeon: Fix octeon_mdiobus_probe function for return values

This patch fixes a possible crash in the octeon_mdiobus_probe function
if the return values are not handled properly.

Signed-off-by: Radha Mohan Chintakuntla <rchintakuntla@cavium.com>
Signed-off-by: Tomasz Nowicki <tomasz.nowicki@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Radha Mohan Chintakuntla and committed by
David S. Miller
de9e397e a6d67864

+9 -5
+9 -5
drivers/net/phy/mdio-octeon.c
··· 277 277 return -ENOMEM; 278 278 279 279 res_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); 280 - 281 280 if (res_mem == NULL) { 282 281 dev_err(&pdev->dev, "found no memory resource\n"); 283 - err = -ENXIO; 284 - goto fail; 282 + return -ENXIO; 285 283 } 284 + 286 285 bus->mdio_phys = res_mem->start; 287 286 bus->regsize = resource_size(res_mem); 287 + 288 288 if (!devm_request_mem_region(&pdev->dev, bus->mdio_phys, bus->regsize, 289 289 res_mem->name)) { 290 290 dev_err(&pdev->dev, "request_mem_region failed\n"); 291 - goto fail; 291 + return -ENXIO; 292 292 } 293 + 293 294 bus->register_base = 294 295 (u64)devm_ioremap(&pdev->dev, bus->mdio_phys, bus->regsize); 296 + if (!bus->register_base) { 297 + dev_err(&pdev->dev, "dev_ioremap failed\n"); 298 + return -ENOMEM; 299 + } 295 300 296 301 bus->mii_bus = mdiobus_alloc(); 297 - 298 302 if (!bus->mii_bus) 299 303 goto fail; 300 304