Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Nicolas Pitre <nicolas.pitre@linaro.org>
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     Dave Mielke <Dave@mielke.cc>, linux-kernel@vger.kernel.org
Subject: [PATCH 5/6] vcs: poll(): cope with a deallocated vt
Date:   Tue,  8 Jan 2019 22:55:03 -0500
Message-Id: <20190109035504.8413-6-nicolas.pitre@linaro.org>
In-Reply-To: <20190109035504.8413-1-nicolas.pitre@linaro.org>
References: <20190109035504.8413-1-nicolas.pitre@linaro.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

When VT_DISALLOCATE is used on a vt, user space waiting with poll() on
the corresponding /dev/vcs device is not awakened. This is now fixed by
returning POLLHUP|POLLERR to user space.

Also, in the normal screen update case, we don't set POLLERR anymore as
POLLPRI alone is a much more logical response in a non-error situation,
saving some confusion on the user space side. The only known user app
making use of poll() on /dev/vcs* is BRLTTY which is known to cope with
that change already, so the risk of breakage is pretty much nonexistent.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
---
 drivers/tty/vt/vc_screen.c | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c
index 3dba60825c..1bbe2a30cd 100644
--- a/drivers/tty/vt/vc_screen.c
+++ b/drivers/tty/vt/vc_screen.c
@@ -80,7 +80,7 @@
 struct vcs_poll_data {
 	struct notifier_block notifier;
 	unsigned int cons_num;
-	bool seen_last_update;
+	int event;
 	wait_queue_head_t waitq;
 	struct fasync_struct *fasync;
 };
@@ -94,7 +94,7 @@ vcs_notifier(struct notifier_block *nb, unsigned long c=
ode, void *_param)
 		container_of(nb, struct vcs_poll_data, notifier);
 	int currcons =3D poll->cons_num;
=20
-	if (code !=3D VT_UPDATE)
+	if (code !=3D VT_UPDATE && code !=3D VT_DEALLOCATE)
 		return NOTIFY_DONE;
=20
 	if (currcons =3D=3D 0)
@@ -104,7 +104,7 @@ vcs_notifier(struct notifier_block *nb, unsigned long=
 code, void *_param)
 	if (currcons !=3D vc->vc_num)
 		return NOTIFY_DONE;
=20
-	poll->seen_last_update =3D false;
+	poll->event =3D code;
 	wake_up_interruptible(&poll->waitq);
 	kill_fasync(&poll->fasync, SIGIO, POLL_IN);
 	return NOTIFY_OK;
@@ -261,7 +261,7 @@ vcs_read(struct file *file, char __user *buf, size_t =
count, loff_t *ppos)
=20
 	poll =3D file->private_data;
 	if (count && poll)
-		poll->seen_last_update =3D true;
+		poll->event =3D 0;
 	read =3D 0;
 	ret =3D 0;
 	while (count) {
@@ -616,12 +616,21 @@ static __poll_t
 vcs_poll(struct file *file, poll_table *wait)
 {
 	struct vcs_poll_data *poll =3D vcs_poll_data_get(file);
-	__poll_t ret =3D DEFAULT_POLLMASK|EPOLLERR|EPOLLPRI;
+	__poll_t ret =3D DEFAULT_POLLMASK|EPOLLERR;
=20
 	if (poll) {
 		poll_wait(file, &poll->waitq, wait);
-		if (poll->seen_last_update)
+		switch (poll->event) {
+		case VT_UPDATE:
+			ret =3D DEFAULT_POLLMASK|EPOLLPRI;
+			break;
+		case VT_DEALLOCATE:
+			ret =3D DEFAULT_POLLMASK|EPOLLHUP|EPOLLERR;
+			break;
+		case 0:
 			ret =3D DEFAULT_POLLMASK;
+			break;
+		}
 	}
 	return ret;
 }
--=20
2.20.1