Merge tag 'tty-4.7-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty (756c0aec) · Commits · 戴 / test

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.

drivers/tty/pty.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -667,9 +667,12 @@ static void pty_unix98_remove(struct tty_driver driver, struct tty_struct tty)
		fsi = tty->driver_data;
		else
		fsi = tty->link->driver_data;

		if (fsi) {
		devpts_kill_index(fsi, tty->index);
		devpts_release(fsi);
		}
		}

		static const struct tty_operations ptm_unix98_ops = {
		.lookup = ptm_unix98_lookup,

drivers/tty/vt/vt.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -750,6 +750,7 @@ static void visual_init(struct vc_data *vc, int num, int init)
		vc->vc_complement_mask = 0;
		vc->vc_can_do_color = 0;
		vc->vc_panic_force_write = false;
		vc->vc_cur_blink_ms = DEFAULT_CURSOR_BLINK_MS;
		vc->vc_sw->con_init(vc, init);
		if (!vc->vc_complement_mask)
		vc->vc_complement_mask = vc->vc_can_do_color ? 0x7700 : 0x0800;

Admin message