From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Dan Drown <dan-netdev@drown.org>,
Oliver Neukum <oneukum@suse.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Sasha Levin <sashal@kernel.org>,
linux-usb@vger.kernel.org
Subject: [PATCH AUTOSEL 6.5 26/28] usb: cdc-acm: move ldisc dcd notification outside of acm's read lock
Date: Fri, 8 Sep 2023 20:36:00 -0400 [thread overview]
Message-ID: <20230909003604.3579407-26-sashal@kernel.org> (raw)
In-Reply-To: <20230909003604.3579407-1-sashal@kernel.org>
From: Dan Drown <dan-netdev@drown.org>
[ Upstream commit f72ae60881ff685004d7de7152517607fcd9968f ]
dcd_change notification call moved outside of the acm->read_lock
to protect any future tty ldisc that calls wait_serial_change()
Signed-off-by: Dan Drown <dan-netdev@drown.org>
Acked-by: Oliver Neukum <oneukum@suse.com>
Link: https://lore.kernel.org/r/ZN1zV/zjPgpGlHXo@vps3.drown.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
drivers/usb/class/cdc-acm.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
index 11da5fb284d0a..ca51230f44409 100644
--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -318,6 +318,16 @@ static void acm_process_notification(struct acm *acm, unsigned char *buf)
}
difference = acm->ctrlin ^ newctrl;
+
+ if ((difference & USB_CDC_SERIAL_STATE_DCD) && acm->port.tty) {
+ struct tty_ldisc *ld = tty_ldisc_ref(acm->port.tty);
+ if (ld) {
+ if (ld->ops->dcd_change)
+ ld->ops->dcd_change(acm->port.tty, newctrl & USB_CDC_SERIAL_STATE_DCD);
+ tty_ldisc_deref(ld);
+ }
+ }
+
spin_lock_irqsave(&acm->read_lock, flags);
acm->ctrlin = newctrl;
acm->oldcount = acm->iocount;
--
2.40.1
next prev parent reply other threads:[~2023-09-09 0:38 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-09 0:35 [PATCH AUTOSEL 6.5 01/28] media: mdp3: Fix resource leaks in of_find_device_by_node Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 02/28] media: dvb-usb-v2: af9035: Fix null-ptr-deref in af9035_i2c_master_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 03/28] media: dw2102: Fix null-ptr-deref in dw2102_i2c_transfer() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 04/28] media: af9005: Fix null-ptr-deref in af9005_i2c_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 05/28] media: anysee: fix null-ptr-deref in anysee_master_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 06/28] media: az6007: Fix null-ptr-deref in az6007_i2c_xfer() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 07/28] media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 08/28] iio: core: Use min() instead of min_t() to make code more robust Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 09/28] scsi: lpfc: Abort outstanding ELS cmds when mailbox timeout error is detected Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 10/28] media: tuners: qt1010: replace BUG_ON with a regular error Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 11/28] media: pci: cx23885: replace BUG with error return Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 12/28] usb: cdns3: Put the cdns set active part outside the spin lock Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 13/28] usb: typec: intel_pmc_mux: Add new ACPI ID for Lunar Lake IOM device Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 14/28] usb: gadget: fsl_qe_udc: validate endpoint index for ch9 udc Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 15/28] tools: iio: iio_generic_buffer: Fix some integer type and calculation Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 16/28] scsi: target: iscsi: Fix buffer overflow in lio_target_nacl_info_show() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 17/28] serial: cpm_uart: Avoid suspicious locking Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 18/28] misc: open-dice: make OPEN_DICE depend on HAS_IOMEM Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 19/28] workqueue: Call wq_update_unbound_numa() on all CPUs in NUMA node on CPU hotplug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 20/28] usb: dwc3: dwc3-octeon: Verify clock divider Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 21/28] usb: ehci: add workaround for chipidea PORTSC.PEC bug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 22/28] usb: chipidea: add workaround for chipidea PEC bug Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 23/28] media: pci: ipu3-cio2: Initialise timing struct to avoid a compiler warning Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 24/28] kobject: Add sanity check for kset->kobj.ktype in kset_register() Sasha Levin
2023-09-09 0:35 ` [PATCH AUTOSEL 6.5 25/28] interconnect: Fix locking for runpm vs reclaim Sasha Levin
2023-09-09 0:36 ` Sasha Levin [this message]
2023-09-09 0:36 ` [PATCH AUTOSEL 6.5 27/28] usb: typec: qcom-pmic-typec: register drm_bridge Sasha Levin
2023-09-09 0:36 ` [PATCH AUTOSEL 6.5 28/28] riscv: Add CFI error handling 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=20230909003604.3579407-26-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=dan-netdev@drown.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=oneukum@suse.com \
--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