mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

net: socionext: Fix two sleep-in-atomic-context bugs in ave_rxfifo_reset()

Browse source 
The driver may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.17 are:

[FUNC] usleep_range
drivers/net/ethernet/socionext/sni_ave.c, 892:
	usleep_range in ave_rxfifo_reset
drivers/net/ethernet/socionext/sni_ave.c, 932:
	ave_rxfifo_reset in ave_irq_handler

[FUNC] usleep_range
drivers/net/ethernet/socionext/sni_ave.c, 888:
	usleep_range in ave_rxfifo_reset
drivers/net/ethernet/socionext/sni_ave.c, 932:
	ave_rxfifo_reset in ave_irq_handler

To fix these bugs, usleep_range() is replaced with udelay().

These bugs are found by my static analysis tool DSAC.

Signed-off-by: Jia-Ju Bai <baijiaju1990@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jia-Ju Bai 2018-09-15 12:02:46 +08:00 committed by David S. Miller
parent 5d288b8865
commit 0020f5c807
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/net/ethernet/socionext/sni_ave.c
View file

@ -895,11 +895,11 @@ static void ave_rxfifo_reset(struct net_device *ndev)
/* assert reset */ /* assert reset */
writel(AVE_GRR_RXFFR, priv->base + AVE_GRR); writel(AVE_GRR_RXFFR, priv->base + AVE_GRR);
usleep_range(40, 50); udelay(50);
/* negate reset */ /* negate reset */
writel(0, priv->base + AVE_GRR); writel(0, priv->base + AVE_GRR);
usleep_range(10, 20); udelay(20);
/* negate interrupt status */ /* negate interrupt status */
writel(AVE_GI_RXOVF, priv->base + AVE_GISR); writel(AVE_GI_RXOVF, priv->base + AVE_GISR);