Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd703a15 authored by Alexey Khoroshilov's avatar Alexey Khoroshilov Committed by David S. Miller
Browse files

net: atheros: atl2: don't return zero on failure path in atl2_probe() 



If dma mask checks fail in atl2_probe(), it breaks off initialization,
deallocates all resources, but returns zero.

The patch adds proper error code return value and
make error code setup unified.

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: default avatarAlexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 232cd35d

drivers/net/ethernet/atheros/atlx/atl2.c

+4 −4
Original line number Diff line number Diff line
@@ -1353,6 +1353,7 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) &&

		pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32))) {

		printk(KERN_ERR "atl2: No usable DMA configuration, aborting\n");

		err = -EIO;

		goto err_dma;

	}
@@ -1366,10 +1367,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * pcibios_set_master to do the needed arch specific settings */

	pci_set_master(pdev);



	err = -ENOMEM;

	netdev = alloc_etherdev(sizeof(struct atl2_adapter));

	if (!netdev)

	if (!netdev) {

		err = -ENOMEM;

		goto err_alloc_etherdev;

	}



	SET_NETDEV_DEV(netdev, &pdev->dev);
@@ -1408,8 +1410,6 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto err_sw_init;



	err = -EIO;



	netdev->hw_features = NETIF_F_HW_VLAN_CTAG_RX;

	netdev->features |= (NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_RX);