mirror of
https://github.com/freebsd/freebsd-src.git
synced 2026-10-28 19:34:43 +01:00
tty: delete knotes when TTY is revoked
Do not clear knotes from the TTY until it gets dealloc'ed, unless the TTY is being revoked, in that case delete the knotes when closed is called on the TTY. When knotes are cleared from a knlist, those knotes become detached from the knlist. And when an event is triggered on a detached knote there isn't an associated knlist and therefore no lock will be taken when the event is triggered. This becomes a problem when a detached knote is triggered on a TTY since the mutex for a TTY is also used as the lock for its knlists. This scenario ends up calling the TTY event handlers without the TTY lock being held and tripping on asserts in the event handlers. PR: 272151 Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D41605
This commit is contained in:
1 parent
d9b7301bb7
commit
acd5638e26
1 file changed
+7
-5
+7
-5
@@ -253,9 +253,6 @@ ttydev_leave(struct tty *tp)
|
||||
ttyoutq_free(&tp->t_outq);
|
||||
tp->t_outlow = 0;
|
||||
|
||||
knlist_clear(&tp->t_inpoll.si_note, 1);
|
||||
knlist_clear(&tp->t_outpoll.si_note, 1);
|
||||
|
||||
if (!tty_gone(tp))
|
||||
ttydevsw_close(tp);
|
||||
|
||||
@@ -369,7 +366,7 @@ done: tp->t_flags &= ~TF_OPENCLOSE;
|
||||
|
||||
static int
|
||||
ttydev_close(struct cdev *dev, int fflag, int devtype __unused,
|
||||
struct thread *td __unused)
|
||||
struct thread *td)
|
||||
{
|
||||
struct tty *tp = dev->si_drv1;
|
||||
|
||||
@@ -392,8 +389,11 @@ ttydev_close(struct cdev *dev, int fflag, int devtype __unused,
|
||||
}
|
||||
|
||||
/* If revoking, flush output now to avoid draining it later. */
|
||||
if (fflag & FREVOKE)
|
||||
if ((fflag & FREVOKE) != 0) {
|
||||
tty_flush(tp, FWRITE);
|
||||
knlist_delete(&tp->t_inpoll.si_note, td, 1);
|
||||
knlist_delete(&tp->t_outpoll.si_note, td, 1);
|
||||
}
|
||||
|
||||
tp->t_flags &= ~TF_EXCLUDE;
|
||||
|
||||
@@ -1120,6 +1120,8 @@ tty_dealloc(void *arg)
|
||||
ttyoutq_free(&tp->t_outq);
|
||||
seldrain(&tp->t_inpoll);
|
||||
seldrain(&tp->t_outpoll);
|
||||
knlist_clear(&tp->t_inpoll.si_note, 0);
|
||||
knlist_clear(&tp->t_outpoll.si_note, 0);
|
||||
knlist_destroy(&tp->t_inpoll.si_note);
|
||||
knlist_destroy(&tp->t_outpoll.si_note);
|
||||
|
||||
|
||||
Reference in new issue
Block a user