From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Amit Shah <amit.shah@redhat.com>,
Rusty Russell <rusty@rustcorp.com.au>
Subject: [ 09/17] virtio: console: return -ENODEV on all read operations after unplug
Date: Mon, 12 Aug 2013 23:35:55 -0700 [thread overview]
Message-ID: <20130813063502.484186083@linuxfoundation.org> (raw)
In-Reply-To: <20130813063501.728847844@linuxfoundation.org>
3.4-stable review patch. If anyone has any objections, please let me know.
------------------
From: Amit Shah <amit.shah@redhat.com>
commit 96f97a83910cdb9d89d127c5ee523f8fc040a804 upstream.
If a port gets unplugged while a user is blocked on read(), -ENODEV is
returned. However, subsequent read()s returned 0, indicating there's no
host-side connection (but not indicating the device went away).
This also happened when a port was unplugged and the user didn't have
any blocking operation pending. If the user didn't monitor the SIGIO
signal, they won't have a chance to find out if the port went away.
Fix by returning -ENODEV on all read()s after the port gets unplugged.
write() already behaves this way.
Signed-off-by: Amit Shah <amit.shah@redhat.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/char/virtio_console.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@ -633,6 +633,10 @@ static ssize_t port_fops_read(struct fil
port = filp->private_data;
+ /* Port is hot-unplugged. */
+ if (!port->guest_connected)
+ return -ENODEV;
+
if (!port_has_data(port)) {
/*
* If nothing's connected on the host just return 0 in
@@ -649,7 +653,7 @@ static ssize_t port_fops_read(struct fil
if (ret < 0)
return ret;
}
- /* Port got hot-unplugged. */
+ /* Port got hot-unplugged while we were waiting above. */
if (!port->guest_connected)
return -ENODEV;
/*
next prev parent reply other threads:[~2013-08-13 6:35 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-13 6:35 [ 00/17] 3.4.58-stable review Greg Kroah-Hartman
2013-08-13 6:35 ` [ 01/17] SCSI: Dont attempt to send extended INQUIRY command if skip_vpd_pages is set Greg Kroah-Hartman
2013-08-13 6:35 ` [ 02/17] SCSI: megaraid_sas: megaraid_sas driver init fails in kdump kernel Greg Kroah-Hartman
2013-08-13 6:35 ` [ 03/17] ext4: make sure group number is bumped after a inode allocation race Greg Kroah-Hartman
2013-08-13 6:35 ` [ 04/17] hwmon: (adt7470) Fix incorrect return code check Greg Kroah-Hartman
2013-08-13 6:35 ` [ 05/17] virtio: console: fix race with port unplug and open/close Greg Kroah-Hartman
2013-08-13 6:35 ` [ 06/17] virtio: console: fix race in port_fops_open() and port unplug Greg Kroah-Hartman
2013-08-13 6:35 ` [ 07/17] virtio: console: clean up port data immediately at time of unplug Greg Kroah-Hartman
2013-08-13 6:35 ` [ 08/17] virtio: console: fix raising SIGIO after port unplug Greg Kroah-Hartman
2013-08-13 6:35 ` Greg Kroah-Hartman [this message]
2013-08-13 6:35 ` [ 10/17] ext4: fix mount/remount error messages for incompatible mount options Greg Kroah-Hartman
2013-08-13 6:35 ` [ 11/17] cifs: extend the buffer length enought for sprintf() using Greg Kroah-Hartman
2013-08-13 6:35 ` [ 12/17] usb: core: dont try to reset_device() a port that got just disconnected Greg Kroah-Hartman
2013-08-13 6:35 ` [ 13/17] debugfs: debugfs_remove_recursive() must not rely on list_empty(d_subdirs) Greg Kroah-Hartman
2013-08-13 6:36 ` [ 14/17] tracing: Fix fields of struct trace_iterator that are zeroed by mistake Greg Kroah-Hartman
2013-08-13 6:36 ` [ 15/17] SCSI: nsp32: use mdelay instead of large udelay constants Greg Kroah-Hartman
2013-08-13 6:36 ` [ 16/17] vfs: d_obtain_alias() needs to use "/" as default name Greg Kroah-Hartman
2013-08-13 6:36 ` [ 17/17] perf tools: Add anonymous huge page recognition Greg Kroah-Hartman
2013-08-13 11:49 ` [ 00/17] 3.4.58-stable review Guenter Roeck
2013-08-13 17:58 ` Greg Kroah-Hartman
2013-08-13 20:19 ` Guenter Roeck
2013-08-13 20:49 ` Geert Uytterhoeven
2013-08-13 22:36 ` Guenter Roeck
2013-08-14 8:26 ` Geert Uytterhoeven
2013-08-14 10:14 ` Guenter Roeck
2013-08-15 6:36 ` Greg Kroah-Hartman
2013-08-15 7:08 ` Guenter Roeck
2013-08-15 8:40 ` Guenter Roeck
2013-08-16 0:54 ` Greg Kroah-Hartman
2013-08-15 9:07 ` Guenter Roeck
2013-08-16 0:58 ` Greg Kroah-Hartman
2013-08-16 1:07 ` Guenter Roeck
2013-08-15 14:45 ` Guenter Roeck
2013-08-16 1:22 ` Greg Kroah-Hartman
2013-08-16 1:28 ` Guenter Roeck
2013-08-16 1:38 ` Greg Kroah-Hartman
2013-08-15 15:12 ` Guenter Roeck
2013-08-16 1:18 ` Greg Kroah-Hartman
2013-08-15 6:35 ` Greg Kroah-Hartman
2013-08-15 16:54 ` Luis Henriques
2013-08-15 6:34 ` Greg Kroah-Hartman
2013-08-15 6:31 ` Greg Kroah-Hartman
2013-08-15 7:43 ` Guenter Roeck
2013-08-15 7:55 ` Geert Uytterhoeven
2013-08-15 8:05 ` Guenter Roeck
2013-08-16 4:53 ` Guenter Roeck
2013-08-16 5:10 ` Greg Kroah-Hartman
2013-08-16 8:26 ` Guenter Roeck
2013-08-16 12:41 ` Greg Kroah-Hartman
2013-08-16 20:27 ` Guenter Roeck
2013-08-16 21:55 ` Geert Uytterhoeven
2013-08-16 22:39 ` Guenter Roeck
2013-08-16 23:08 ` Greg Kroah-Hartman
2013-08-16 0:53 ` Greg Kroah-Hartman
2013-08-13 20:33 ` Guenter Roeck
2013-08-13 17:19 ` Shuah Khan
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=20130813063502.484186083@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=amit.shah@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rusty@rustcorp.com.au \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.