summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJia-Ju Bai <baijiaju1990@163.com>2017-12-12 16:49:52 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-25 11:08:04 +0100
commite94fc847bd6e405e7c2b8849e52c102070777387 (patch)
treed6130d86e28bd23d2f0a7de40d055b4abe54d7ac
parent385aeea7128918b57f7a4dd70c0fa55c50c6daa3 (diff)
downloadtalos-op-linux-e94fc847bd6e405e7c2b8849e52c102070777387.tar.gz
talos-op-linux-e94fc847bd6e405e7c2b8849e52c102070777387.zip
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@verizon.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/hippi/rrunner.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hippi/rrunner.c b/drivers/net/hippi/rrunner.c
index 71ddadbf2368..d7ba2b813eff 100644
--- a/drivers/net/hippi/rrunner.c
+++ b/drivers/net/hippi/rrunner.c
@@ -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;
}
OpenPOWER on IntegriCloud