evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gianfar: Fix alloc_skb_resources on -ENOMEM cleanup path

Browse source 
Should gfar_init_bds() return with -ENOMEM inside gfar_alloc_skb_resources(),
free_skb_resources() will be called twice in a row on the "cleanup" path,
leading to duplicate kfree() calls for rx_|tx_queue->rx_|tx_skbuff resulting
in segmentation fault.
This patch prevents the segmentation fault to happen in the future
(rx_|tx_sbkbuff set to NULL), and corrects the error path handling
for gfar_init_bds().

Cc: Paul Gortmaker <paul.gortmaker@windriver.com>

Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com>
Acked-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Claudiu Manoil 2012-11-08 22:11:41 +00:00 • committed by David S. Miller
parent be44389964
commit 1eb8f7a7da
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/ethernet/freescale/gianfar.c
View file

@ -210,7 +210,7 @@ static int gfar_init_bds(struct net_device *ndev)
skb = gfar_new_skb(ndev); skb = gfar_new_skb(ndev);
if (!skb) { if (!skb) {
netdev_err(ndev, "Can't allocate RX buffers\n"); netdev_err(ndev, "Can't allocate RX buffers\n");
goto err_rxalloc_fail; return -ENOMEM;
} }
rx_queue->rx_skbuff[j] = skb; rx_queue->rx_skbuff[j] = skb;
@ -223,10 +223,6 @@ static int gfar_init_bds(struct net_device *ndev)
} }
return 0; return 0;
err_rxalloc_fail:
free_skb_resources(priv);
return -ENOMEM;
} }
static int gfar_alloc_skb_resources(struct net_device *ndev) static int gfar_alloc_skb_resources(struct net_device *ndev)
@ -1356,7 +1352,11 @@ static int gfar_restore(struct device *dev)
if (!netif_running(ndev)) if (!netif_running(ndev))
return 0; return 0;
gfar_init_bds(ndev); if (gfar_init_bds(ndev)) {
free_skb_resources(priv);
return -ENOMEM;
}
init_registers(ndev); init_registers(ndev);
gfar_set_mac_address(ndev); gfar_set_mac_address(ndev);
gfar_init_mac(ndev); gfar_init_mac(ndev);
@ -1709,6 +1709,7 @@ static void free_skb_tx_queue(struct gfar_priv_tx_q *tx_queue)
tx_queue->tx_skbuff[i] = NULL; tx_queue->tx_skbuff[i] = NULL;
} }
kfree(tx_queue->tx_skbuff); kfree(tx_queue->tx_skbuff);
tx_queue->tx_skbuff = NULL;
} }
static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue) static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
@ -1732,6 +1733,7 @@ static void free_skb_rx_queue(struct gfar_priv_rx_q *rx_queue)
rxbdp++; rxbdp++;
} }
kfree(rx_queue->rx_skbuff); kfree(rx_queue->rx_skbuff);
rx_queue->rx_skbuff = NULL;
} }
/* If there are any tx skbs or rx skbs still around, free them. /* If there are any tx skbs or rx skbs still around, free them.