linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Oliver Neukum <oneukum@suse.com>
To: penguin-kernel@i-love.sakura.ne.jp, bjorn@mork.no,
	linux-usb@vger.kernel.org
Cc: Oliver Neukum <oneukum@suse.com>
Subject: [RFC 4/7] CDC-WDM: fix race reporting errors in flush
Date: Thu, 17 Sep 2020 12:06:11 +0200	[thread overview]
Message-ID: <20200917100614.1010-5-oneukum@suse.com> (raw)
In-Reply-To: <20200917100614.1010-1-oneukum@suse.com>

In case a race was lost and multiple fds used,
an error could be reported multiple times. To fix
this a spinlock must be taken.

Signed-off-by: Oliver Neukum <oneukum@suse.com>
---
 drivers/usb/class/cdc-wdm.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c
index eee19532e67e..930000b1d43b 100644
--- a/drivers/usb/class/cdc-wdm.c
+++ b/drivers/usb/class/cdc-wdm.c
@@ -610,10 +610,14 @@ static int wdm_flush(struct file *file, fl_owner_t id)
 		return -EIO;
 	if (rv < 0)
 		return -EINTR;
+
+	spin_lock_irq(&desc->iuspin);
 	rv = desc->werr;
+	desc->werr = 0;
+	spin_unlock_irq(&desc->iuspin);
+
 	if (rv < 0)
-		dev_err(&desc->intf->dev, "Error in flush path: %d\n",
-			rv);
+		dev_err(&desc->intf->dev, "Error in flush path: %d\n", rv);
 
 	return usb_translate_errors(rv);
 }
-- 
2.16.4


  parent reply	other threads:[~2020-09-17 10:06 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-17 10:06 [RFC] fix CDC-WDM in multithreaded environment and improve Oliver Neukum
2020-09-17 10:06 ` [RFC 1/7] CDC-WDM: fix hangs in flush() Oliver Neukum
2020-09-17 10:06 ` [RFC 2/7] CDC-WDM: introduce a timeout " Oliver Neukum
2020-09-17 10:06 ` [RFC 3/7] CDC-WDM: making flush() interruptible Oliver Neukum
2020-09-17 10:06 ` Oliver Neukum [this message]
2020-09-17 10:06 ` [RFC 5/7] CDC-WDM: remove use of intf->dev after potential disconnect Oliver Neukum
2020-09-17 10:06 ` [RFC 6/7] CDC-WDM: correct error reporting in write() Oliver Neukum
2020-09-17 10:06 ` [RFC 7/7] CDC-WDM: implement fsync Oliver Neukum
  -- strict thread matches above, loose matches on Subject: below --
2020-09-22 11:21 [RFC] fixes for hangs and error reporting in CDC_WDM Oliver Neukum
2020-09-22 11:21 ` [RFC 4/7] CDC-WDM: fix race reporting errors in flush Oliver Neukum

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=20200917100614.1010-5-oneukum@suse.com \
    --to=oneukum@suse.com \
    --cc=bjorn@mork.no \
    --cc=linux-usb@vger.kernel.org \
    --cc=penguin-kernel@i-love.sakura.ne.jp \
    /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).