From: Amit Shah Date: Thu, 2 Sep 2010 12:41:42 +0000 (+0530) Subject: virtio: console: Check if portdev is valid in send_control_msg() X-Git-Tag: v2.6.37-rc1~219^2~16 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=84ec06c59a14d0941dd58ca6793b24a7e86b3b85;p=platform%2Fupstream%2Fkernel-adaptation-pc.git virtio: console: Check if portdev is valid in send_control_msg() A portdev may have been hot-unplugged while a port was open()ed. Skip sending control messages when the portdev isn't valid. Signed-off-by: Amit Shah Signed-off-by: Rusty Russell --- diff --git a/drivers/char/virtio_console.c b/drivers/char/virtio_console.c index e15dbe7..e1d382b 100644 --- a/drivers/char/virtio_console.c +++ b/drivers/char/virtio_console.c @@ -410,7 +410,10 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, static ssize_t send_control_msg(struct port *port, unsigned int event, unsigned int value) { - return __send_control_msg(port->portdev, port->id, event, value); + /* Did the port get unplugged before userspace closed it? */ + if (port->portdev) + return __send_control_msg(port->portdev, port->id, event, value); + return 0; } /* Callers must take the port->outvq_lock */