From: Chengfeng Ye <dg573847474@gmail.com>
To: 3chas3@gmail.com, davem@davemloft.net, horms@kernel.org
Cc: linux-atm-general@lists.sourceforge.net, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org,
Chengfeng Ye <dg573847474@gmail.com>
Subject: [PATCH v2 1/2] atm: solos-pci: Fix potential deadlock on &cli_queue_lock
Date: Thu, 5 Oct 2023 07:48:58 +0000 [thread overview]
Message-ID: <20231005074858.65082-1-dg573847474@gmail.com> (raw)
As &card->cli_queue_lock is acquired under softirq context along the
following call chain from solos_bh(), other acquisition of the same
lock inside process context should disable at least bh to avoid double
lock.
<deadlock #1>
console_show()
--> spin_lock(&card->cli_queue_lock)
<interrupt>
--> solos_bh()
--> spin_lock(&card->cli_queue_lock)
This flaw was found by an experimental static analysis tool I am
developing for irq-related deadlock.
To prevent the potential deadlock, the patch uses spin_lock_irqsave()
on the card->cli_queue_lock under process context code consistently
to prevent the possible deadlock scenario.
Fixes: 9c54004ea717 ("atm: Driver for Solos PCI ADSL2+ card.")
Signed-off-by: Chengfeng Ye <dg573847474@gmail.com>
---
V2: add fix tag, and slipt into two patches
drivers/atm/solos-pci.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index 94fbc3abe60e..48cf9b36b61a 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -447,11 +447,12 @@ static ssize_t console_show(struct device *dev, struct device_attribute *attr,
struct atm_dev *atmdev = container_of(dev, struct atm_dev, class_dev);
struct solos_card *card = atmdev->dev_data;
struct sk_buff *skb;
+ unsigned long flags;
unsigned int len;
- spin_lock(&card->cli_queue_lock);
+ spin_lock_irqsave(&card->cli_queue_lock, flags);
skb = skb_dequeue(&card->cli_queue[SOLOS_CHAN(atmdev)]);
- spin_unlock(&card->cli_queue_lock);
+ spin_unlock_irqrestore(&card->cli_queue_lock, flags);
if(skb == NULL)
return sprintf(buf, "No data.\n");
--
2.17.1
next reply other threads:[~2023-10-05 7:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-05 7:48 Chengfeng Ye [this message]
2023-10-06 23:28 ` [PATCH v2 1/2] atm: solos-pci: Fix potential deadlock on &cli_queue_lock Jakub Kicinski
2023-10-07 15:58 ` Chengfeng Ye
2023-10-09 15:17 ` Jakub Kicinski
2023-12-07 12:37 ` Chengfeng Ye
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=20231005074858.65082-1-dg573847474@gmail.com \
--to=dg573847474@gmail.com \
--cc=3chas3@gmail.com \
--cc=davem@davemloft.net \
--cc=horms@kernel.org \
--cc=linux-atm-general@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@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).