aboutsummaryrefslogtreecommitdiff
path: root/drivers/tty
diff options
context:
space:
mode:
authorJan Engelmohr <jan.engelmohr@mailbox.tu-dresden.de>2016-07-26 18:10:00 +0200
committerMoyster <oysterized@gmail.com>2016-08-26 15:59:39 +0200
commitd2ee3e254ee0939806c103c145035ddac9fe5953 (patch)
tree2fc8a4984c6cec24591bb68f3e0623bd1c1d45fc /drivers/tty
parenta2904e3eed56216fe65091d9b3638ae1f90e43fa (diff)
3.10.70 -> 3.10.71
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/pty.c3
-rw-r--r--drivers/tty/vt/vt.c4
2 files changed, 6 insertions, 1 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 8c1b87896..bdfe8ecc7 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -214,6 +214,9 @@ static int pty_signal(struct tty_struct *tty, int sig)
unsigned long flags;
struct pid *pgrp;
+ if (sig != SIGINT && sig != SIGQUIT && sig != SIGTSTP)
+ return -EINVAL;
+
if (tty->link) {
spin_lock_irqsave(&tty->link->ctrl_lock, flags);
pgrp = get_pid(tty->link->pgrp);
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 0d1b3757c..db9d69fa1 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -498,6 +498,7 @@ void invert_screen(struct vc_data *vc, int offset, int count, int viewed)
#endif
if (DO_UPDATE(vc))
do_update_region(vc, (unsigned long) p, count);
+ notify_update(vc);
}
/* used by selection: complement pointer position */
@@ -514,6 +515,7 @@ void complement_pos(struct vc_data *vc, int offset)
scr_writew(old, screenpos(vc, old_offset, 1));
if (DO_UPDATE(vc))
vc->vc_sw->con_putc(vc, old, oldy, oldx);
+ notify_update(vc);
}
old_offset = offset;
@@ -531,8 +533,8 @@ void complement_pos(struct vc_data *vc, int offset)
oldy = (offset >> 1) / vc->vc_cols;
vc->vc_sw->con_putc(vc, new, oldy, oldx);
}
+ notify_update(vc);
}
-
}
static void insert_char(struct vc_data *vc, unsigned int nr)