Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tty-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH:
"Here are two tty fixes for some reported issues. One resolves a crash
in devpts, and the other resolves a problem with the fbcon cursor
blink causing lockups.
Both have been in linux-next with no reported problems"
* tag 'tty-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
devpts: fix null pointer dereference on failed memory allocation
tty: vt: Fix soft lockup in fbcon cursor blink timer.
+6
-2
+5
-2
drivers/tty/pty.c
+5
-2
drivers/tty/pty.c
···
667
667
fsi = tty->driver_data;
668
668
else
669
669
fsi = tty->link->driver_data;
670
-
devpts_kill_index(fsi, tty->index);
671
-
devpts_release(fsi);
670
+
671
+
if (fsi) {
672
+
devpts_kill_index(fsi, tty->index);
673
+
devpts_release(fsi);
674
+
}
672
675
}
673
676
674
677
static const struct tty_operations ptm_unix98_ops = {
+1
drivers/tty/vt/vt.c
+1
drivers/tty/vt/vt.c
···
750
750
vc->vc_complement_mask = 0;
751
751
vc->vc_can_do_color = 0;
752
752
vc->vc_panic_force_write = false;
753
+
vc->vc_cur_blink_ms = DEFAULT_CURSOR_BLINK_MS;
753
754
vc->vc_sw->con_init(vc, init);
754
755
if (!vc->vc_complement_mask)
755
756
vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;