]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
hippi: Fix a Fix a possible sleep-in-atomic bug in rr_close
authorJia-Ju Bai <baijiaju1990@163.com>
Tue, 12 Dec 2017 08:49:52 +0000 (16:49 +0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 13 Dec 2017 19:52:57 +0000 (14:52 -0500)
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>
drivers/net/hippi/rrunner.c

index 8483f03d5a4103d6c4da7d5d586a99e013f06107..1ab97d99b9bae9f9dde6227dacff606256e66c72 100644 (file)
@@ -1379,8 +1379,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;
 }