diff options
author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2016-03-26 17:24:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-03-27 22:39:22 -0400 |
commit | 79c134239df989167acd277364b83ff9e91e70c4 (patch) | |
tree | 48d945e9930d95c5f293cf7b5c2647fccb7f9f2f | |
parent | 66391b383b70920629df403f2881ea48805e6659 (diff) |
net: sxgbe: fix error paths in sxgbe_platform_probe()
We need to use post-decrement to ensure that irq_dispose_mapping is
also called on priv->rxq[0]->irq_no; moreover, if one of the above for
loops failed already at i==0 (so we reach one of these labels with
that value of i), we'll enter an essentially infinite loop of
out-of-bounds accesses.
Signed-off-by: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Reviewed-by: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c index b02eed12bfc5..73427e29df2a 100644 --- a/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c +++ b/drivers/net/ethernet/samsung/sxgbe/sxgbe_platform.c | |||
@@ -155,11 +155,11 @@ static int sxgbe_platform_probe(struct platform_device *pdev) | |||
155 | return 0; | 155 | return 0; |
156 | 156 | ||
157 | err_rx_irq_unmap: | 157 | err_rx_irq_unmap: |
158 | while (--i) | 158 | while (i--) |
159 | irq_dispose_mapping(priv->rxq[i]->irq_no); | 159 | irq_dispose_mapping(priv->rxq[i]->irq_no); |
160 | i = SXGBE_TX_QUEUES; | 160 | i = SXGBE_TX_QUEUES; |
161 | err_tx_irq_unmap: | 161 | err_tx_irq_unmap: |
162 | while (--i) | 162 | while (i--) |
163 | irq_dispose_mapping(priv->txq[i]->irq_no); | 163 | irq_dispose_mapping(priv->txq[i]->irq_no); |
164 | irq_dispose_mapping(priv->irq); | 164 | irq_dispose_mapping(priv->irq); |
165 | err_drv_remove: | 165 | err_drv_remove: |