Commit bbd6d088 authored Dec 12, 2017 by Jia-Ju Bai Committed by Greg Kroah-Hartman Feb 25, 2018

hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close




[ Upstream commit 6e266610eb6553cfb7e7eb5d11914bd01509c406 ]

The driver may sleep under a spinlock.
The function call path is:
rr_close (acquire the spinlock)
  free_irq --> may sleep

To fix it, free_irq is moved to the place without holding the spinlock.

This bug is found by my static analysis tool(DSAC) and checked by my code review.

Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 12652198

drivers/net/hippi/rrunner.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1381,8 +1381,8 @@ static int rr_close(struct net_device *dev)
		rrpriv->info_dma);
		rrpriv->info = NULL;

		free_irq(pdev->irq, dev);
		spin_unlock_irqrestore(&rrpriv->lock, flags);
		free_irq(pdev->irq, dev);

		return 0;
		}