From: Abinash Singh <abinashlalotra@gmail.com>
To: johan@kernel.org
Cc: gregkh@linuxfoundation.org, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org,
Abinash Singh <abinashsinghlalotra@gmail.com>
Subject: [RFC PATCH] usb_wwan : add locking around shared port data in two FIXME-marked places
Date: Fri, 20 Jun 2025 15:47:47 +0530 [thread overview]
Message-ID: <20250620101747.39037-1-abinashsinghlalotra@gmail.com> (raw)
Fix two locking-related FIXME comments by adding a mutex
to protect shared fields in `usb_wwan_port_private`.
- In `usb_wwan_dtr_rts()`, access to `rts_state`
and `dtr_state` is now protected by `portdata->lock`.
- In `usb_wwan_tiocmset()`, access to `rts_state`
and `dtr_state` is now also synchronized with the same mutex.
These changes prevent possible data races
and inconsistent state updates when the port is written concurrently.
Signed-off-by: Abinash Singh <abinashsinghlalotra@gmail.com>
---
usb_wwan_chars_in_buffer() have this:
/* FIXME: This locking is insufficient as this_urb may
go unused during the test */
How can we do proper locking there ?
Do we need to lock portdata in other places also ? I see no other FIXME related to locking
Thank You
Regards
Abinash
---
drivers/usb/serial/usb-wwan.h | 3 +++
drivers/usb/serial/usb_wwan.c | 7 ++++---
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/serial/usb-wwan.h b/drivers/usb/serial/usb-wwan.h
index 519101945..3cc0d4ef4 100644
--- a/drivers/usb/serial/usb-wwan.h
+++ b/drivers/usb/serial/usb-wwan.h
@@ -59,6 +59,9 @@ struct usb_wwan_port_private {
int ri_state;
unsigned long tx_start_time[N_OUT_URB];
+
+ /* Locking */
+ struct mutex lock;
};
#endif /* __LINUX_USB_USB_WWAN */
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index 0017f6e96..4bd81b21f 100644
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -80,10 +80,10 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
return;
portdata = usb_get_serial_port_data(port);
- /* FIXME: locking */
+ mutex_lock(&portdata->lock);
portdata->rts_state = on;
portdata->dtr_state = on;
-
+ mutex_unlock(&portdata->lock);
usb_wwan_send_setup(port);
}
EXPORT_SYMBOL(usb_wwan_dtr_rts);
@@ -120,7 +120,7 @@ int usb_wwan_tiocmset(struct tty_struct *tty,
if (!intfdata->use_send_setup)
return -EINVAL;
- /* FIXME: what locks portdata fields ? */
+ mutex_lock(&portdata->lock);
if (set & TIOCM_RTS)
portdata->rts_state = 1;
if (set & TIOCM_DTR)
@@ -130,6 +130,7 @@ int usb_wwan_tiocmset(struct tty_struct *tty,
portdata->rts_state = 0;
if (clear & TIOCM_DTR)
portdata->dtr_state = 0;
+ mutex_unlock(&portdata->lock);
return usb_wwan_send_setup(port);
}
EXPORT_SYMBOL(usb_wwan_tiocmset);
--
2.43.0
next reply other threads:[~2025-06-20 10:18 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-06-20 10:17 Abinash Singh [this message]
2025-06-24 8:02 ` Oliver Neukum
2025-06-26 15:31 ` [PATCH] usb: serial: usb_wwan: Fix data races by protecting dtr/rts state with a mutex Abinash Singh
2025-06-28 14:54 ` Greg KH
2025-07-01 21:45 ` [PATCH v2] " Abinash Singh
2025-07-07 8:56 ` Greg KH
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=20250620101747.39037-1-abinashsinghlalotra@gmail.com \
--to=abinashlalotra@gmail.com \
--cc=abinashsinghlalotra@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@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
all inboxes | Powered by JetHome®