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

Commit e6afb1ad authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: korina: Fix NAPI versus resources freeing 



Commit beb0babf ("korina: disable napi on close and restart")
introduced calls to napi_disable() that were missing before,
unfortunately this leaves a small window during which NAPI has a chance
to run, yet we just freed resources since korina_free_ring() has been
called:

Fix this by disabling NAPI first then freeing resource, and make sure
that we also cancel the restart task before doing the resource freeing.

Fixes: beb0babf ("korina: disable napi on close and restart")
Reported-by: default avatarAlexandros C. Couloumbis <alex@ozo.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 628185cf

drivers/net/ethernet/korina.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -900,10 +900,10 @@ static void korina_restart_task(struct work_struct *work) 
				DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR,

				DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR,

				&lp->rx_dma_regs->dmasm);

				&lp->rx_dma_regs->dmasm);





	korina_free_ring(dev);



	napi_disable(&lp->napi);

	napi_disable(&lp->napi);





	korina_free_ring(dev);



	if (korina_init(dev) < 0) {

	if (korina_init(dev) < 0) {

		printk(KERN_ERR "%s: cannot restart device\n", dev->name);

		printk(KERN_ERR "%s: cannot restart device\n", dev->name);

		return;

		return;
@@ -1064,12 +1064,12 @@ static int korina_close(struct net_device *dev) 
	tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR;

	tmp = tmp | DMA_STAT_DONE | DMA_STAT_HALT | DMA_STAT_ERR;

	writel(tmp, &lp->rx_dma_regs->dmasm);

	writel(tmp, &lp->rx_dma_regs->dmasm);





	korina_free_ring(dev);



	napi_disable(&lp->napi);

	napi_disable(&lp->napi);





	cancel_work_sync(&lp->restart_task);

	cancel_work_sync(&lp->restart_task);





	korina_free_ring(dev);



	free_irq(lp->rx_irq, dev);

	free_irq(lp->rx_irq, dev);

	free_irq(lp->tx_irq, dev);

	free_irq(lp->tx_irq, dev);

	free_irq(lp->ovr_irq, dev);

	free_irq(lp->ovr_irq, dev);