From: Sasha Levin <Alexander.Levin@microsoft.com>
To: "stable@vger.kernel.org" <stable@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Cc: Jia-Ju Bai <baijiaju1990@gmail.com>,
"David S . Miller" <davem@davemloft.net>,
Sasha Levin <Alexander.Levin@microsoft.com>
Subject: [PATCH AUTOSEL 3.18 07/13] net: cadence: Fix a sleep-in-atomic-context bug in macb_halt_tx()
Date: Mon, 24 Sep 2018 14:50:11 +0000 [thread overview]
Message-ID: <20180924144959.164754-7-alexander.levin@microsoft.com> (raw)
In-Reply-To: <20180924144959.164754-1-alexander.levin@microsoft.com>
From: Jia-Ju Bai <baijiaju1990@gmail.com>
[ Upstream commit 16fe10cf92783ed9ceb182d6ea2b8adf5e8ec1b8 ]
The kernel module may sleep with holding a spinlock.
The function call paths (from bottom to top) in Linux-4.16 are:
[FUNC] usleep_range
drivers/net/ethernet/cadence/macb_main.c, 648:
usleep_range in macb_halt_tx
drivers/net/ethernet/cadence/macb_main.c, 730:
macb_halt_tx in macb_tx_error_task
drivers/net/ethernet/cadence/macb_main.c, 721:
_raw_spin_lock_irqsave in macb_tx_error_task
To fix this bug, usleep_range() is replaced with udelay().
This bug is 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>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
drivers/net/ethernet/cadence/macb.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 4d9fc0509af6..b3e134e53bf1 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -464,7 +464,7 @@ static int macb_halt_tx(struct macb *bp)
if (!(status & MACB_BIT(TGO)))
return 0;
- usleep_range(10, 250);
+ udelay(250);
} while (time_before(halt_time, timeout));
return -ETIMEDOUT;
--
2.17.1
next prev parent reply other threads:[~2018-09-24 20:54 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-24 14:50 [PATCH AUTOSEL 3.18 01/13] KVM: PPC: Book3S HV: Don't truncate HPTE index in xlate function Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 02/13] mac80211: correct use of IEEE80211_VHT_CAP_RXSTBC_X Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 04/13] cfg80211: nl80211_update_ft_ies() to validate NL80211_ATTR_IE Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 03/13] gpio: adp5588: Fix sleep-in-atomic-context bug Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 06/13] net: ethernet: cpsw-phy-sel: prefer phandle for phy sel Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 05/13] RAID10 BUG_ON in raise_barrier when force is true and conf->barrier is 0 Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 08/13] fs/cifs: don't translate SFM_SLASH (U+F026) to backslash Sasha Levin
2018-09-24 14:50 ` Sasha Levin [this message]
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 09/13] mac80211: fix a race between restart and CSA flows Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 10/13] mac80211: Fix station bandwidth setting after channel switch Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 11/13] mac80211: shorten the IBSS debug messages Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 12/13] tools/vm/slabinfo.c: fix sign-compare warning Sasha Levin
2018-09-24 14:50 ` [PATCH AUTOSEL 3.18 13/13] tools/vm/page-types.c: fix "defined but not used" warning Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180924144959.164754-7-alexander.levin@microsoft.com \
--to=alexander.levin@microsoft.com \
--cc=baijiaju1990@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).