aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKonstantin Belousov <kib@FreeBSD.org>2021-05-13 01:35:06 +0000
committerKonstantin Belousov <kib@FreeBSD.org>2021-05-25 07:15:51 +0000
commit4abc8e0a7335e2e79e3bb03eaed660ddc9c72bba (patch)
tree1387350705b3d2542ebac8509693a02ae064e8c8
parent72fe4684e01b0059104de5e6300515f3702ad87c (diff)
ttydev_write: prevent stops while terminal is busied
PR: 255816 (cherry picked from commit 8cf912b017a04a2eec01fbaa1f7b9ef556403ede)
-rw-r--r--sys/kern/tty.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/kern/tty.c b/sys/kern/tty.c
index 00b4df675311..8700eb8f9ef1 100644
--- a/sys/kern/tty.c
+++ b/sys/kern/tty.c
@@ -525,7 +525,7 @@ static int
ttydev_write(struct cdev *dev, struct uio *uio, int ioflag)
{
struct tty *tp = dev->si_drv1;
- int error;
+ int defer, error;
error = ttydev_enter(tp);
if (error)
@@ -549,7 +549,9 @@ ttydev_write(struct cdev *dev, struct uio *uio, int ioflag)
}
tp->t_flags |= TF_BUSY_OUT;
+ defer = sigdeferstop(SIGDEFERSTOP_ERESTART);
error = ttydisc_write(tp, uio, ioflag);
+ sigallowstop(defer);
tp->t_flags &= ~TF_BUSY_OUT;
cv_signal(&tp->t_outserwait);
}