mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Greg KH <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: torvalds@linux-foundation.org, akpm@linux-foundation.org,
	alan@lxorguk.ukuu.org.uk, jhovold@gmail.com,
	linux-usb@vger.kernel.org,
	Thilo-Alexander Ginkel <thilo@ginkel.com>
Subject: [39/40] usb: cdc-acm: Fix acm_tty_hangup() vs. acm_tty_close() race
Date: Tue, 10 Jan 2012 13:45:52 -0800	[thread overview]
Message-ID: <20120110214621.607398193@clark.kroah.org> (raw)
In-Reply-To: <20120110214630.GA14384@kroah.com>

3.0-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Thilo-Alexander Ginkel <thilo@ginkel.com>

[Not upstream as it was fixed differently for 3.3 with a much more
"intrusive" rework of the driver - gregkh]

There is a race condition involving acm_tty_hangup() and acm_tty_close()
where hangup() would attempt to access tty->driver_data without proper
locking and NULL checking after close() has potentially already set it
to NULL.  One possibility to (sporadically) trigger this behavior is to
perform a suspend/resume cycle with a running WWAN data connection.

This patch addresses the issue by introducing a NULL check for
tty->driver_data in acm_tty_hangup() protected by open_mutex and exiting
gracefully when hangup() is invoked on a device that has already been
closed.

Signed-off-by: Thilo-Alexander Ginkel <thilo@ginkel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/usb/class/cdc-acm.c |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

--- a/drivers/usb/class/cdc-acm.c
+++ b/drivers/usb/class/cdc-acm.c
@@ -554,10 +554,18 @@ static void acm_port_down(struct acm *ac
 
 static void acm_tty_hangup(struct tty_struct *tty)
 {
-	struct acm *acm = tty->driver_data;
-	tty_port_hangup(&acm->port);
+	struct acm *acm;
+
 	mutex_lock(&open_mutex);
+	acm = tty->driver_data;
+
+	if (!acm)
+		goto out;
+
+	tty_port_hangup(&acm->port);
 	acm_port_down(acm);
+
+out:
 	mutex_unlock(&open_mutex);
 }
 



  parent reply	other threads:[~2012-01-10 22:59 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-01-10 21:46 [00/40] 3.0.17-stable review Greg KH
2012-01-10 21:45 ` [01/40] MAINTAINERS: stable: Update address Greg KH
2012-01-10 21:45 ` [02/40] Documentation: Update stable address Greg KH
2012-01-10 21:45 ` [03/40] firmware: Fix an oops on reading fw_priv->fw in sysfs loading file Greg KH
2012-01-10 21:45 ` [04/40] rt2800usb: Move ID out of unknown Greg KH
2012-01-10 21:45 ` [05/40] offb: Fix setting of the pseudo-palette for >8bpp Greg KH
2012-01-10 21:45 ` [06/40] offb: Fix bug in calculating requested vram size Greg KH
2012-01-10 21:45 ` [07/40] wl12xx: Validate FEM index from ini file and FW Greg KH
2012-01-10 21:45 ` [08/40] wl12xx: Check buffer bound when processing nvs data Greg KH
2012-01-10 21:45 ` [09/40] powerpc/time: Handle wrapping of decrementer Greg KH
2012-01-10 21:45 ` [10/40] powerpc: Fix unpaired probe_hcall_entry and probe_hcall_exit Greg KH
2012-01-10 21:45 ` [11/40] asix: new device id Greg KH
2012-01-10 21:45 ` [12/40] IB/qib: Fix a possible data corruption when receiving packets Greg KH
2012-01-10 21:45 ` [13/40] perf: Fix parsing of __print_flags() in TP_printk() Greg KH
2012-01-10 21:45 ` [14/40] reiserfs: Fix quota mount option parsing Greg KH
2012-01-10 21:45 ` [15/40] reiserfs: Force inode evictions before umount to avoid crash Greg KH
2012-01-10 21:45 ` [16/40] ext3: Dont warn from writepage when readonly inode is spotted after error Greg KH
2012-01-10 21:45 ` [17/40] USB: update documentation for usbmon Greg KH
2012-01-10 21:45 ` [18/40] atmel_serial: fix spinlock lockup in RS485 code Greg KH
2012-01-10 21:45 ` [19/40] cgroup: fix to allow mounting a hierarchy by name Greg KH
2012-01-10 21:45 ` [20/40] udf: Fix deadlock when converting file from in-ICB one to normal one Greg KH
2012-01-10 21:45 ` [21/40] drivers/usb/class/cdc-acm.c: clear dangling pointer Greg KH
2012-01-10 21:45 ` [22/40] USB: isight: fix kernel bug when loading firmware Greg KH
2012-01-10 21:45 ` [23/40] usb: usb-storage doesnt support dynamic id currently, the patch disables the feature to fix an oops Greg KH
2012-01-10 21:45 ` [24/40] USB: add quirk for another camera Greg KH
2012-01-10 21:45 ` [25/40] usb: musb: fix pm_runtime mismatch Greg KH
2012-01-10 21:45 ` [26/40] USB: omninet: fix write_room Greg KH
2012-01-10 21:45 ` [27/40] USB: Add USB-ID for Multiplex RC serial adapter to cp210x.c Greg KH
2012-01-10 21:45 ` [28/40] usb: fix number of mapped SG DMA entries Greg KH
2012-01-10 21:45 ` [29/40] xhci: Properly handle COMP_2ND_BW_ERR Greg KH
2012-01-10 21:45 ` [30/40] USB: option: add id for 3G dongle Model VT1000 of Viettel Greg KH
2012-01-10 21:45 ` [31/40] usb: option: add ZD Incorporated HSPA modem Greg KH
2012-01-10 21:45 ` [32/40] usb: ch9: fix up MaxStreams helper Greg KH
2012-01-10 21:45 ` [33/40] OHCI: final fix for NVIDIA problems (I hope) Greg KH
2012-01-10 21:45 ` [34/40] igmp: Avoid zero delay when receiving odd mixture of IGMP queries Greg KH
2012-01-10 21:45 ` [35/40] asix: fix infinite loop in rx_fixup() Greg KH
2012-01-10 21:45 ` [36/40] bonding: fix error handling if slave is busy (v2) Greg KH
2012-01-10 21:45 ` [37/40] PM / Sleep: Fix race between CPU hotplug and freezer Greg KH
2012-01-10 21:45 ` [38/40] SCSI: mpt2sas: Added missing mpt2sas_base_detach call from scsih_remove context Greg KH
2012-01-10 21:45 ` Greg KH [this message]
2012-01-10 21:45 ` [40/40] xfs: fix acl count validation in xfs_acl_from_disk() Greg KH
2012-01-11 22:21 ` [00/40] 3.0.17-stable review Nick Bowler
2012-01-12 23:01   ` Greg KH
2012-01-12 23:15     ` David Miller
2012-01-17 17:47       ` Greg KH
2012-01-26 18:35       ` 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=20120110214621.607398193@clark.kroah.org \
    --to=gregkh@suse.de \
    --cc=akpm@linux-foundation.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=jhovold@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=thilo@ginkel.com \
    --cc=torvalds@linux-foundation.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®