Patch "tty: vt: fix up tabstops properly" has been added to the 4.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
tty: vt: fix up tabstops properly
to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
tty-vt-fix-up-tabstops-properly.patch
and it can be found in the queue-4.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
f1869a890cdedb92a3fab969db5d0fd982850273Mon Sep 17 00:00:00 2001
From: Linus Torvalds <[email protected]>
Date: Sat, 24 Mar 2018 10:43:26 +0100
Subject: tty: vt: fix up tabstops properly
From: Linus Torvalds <[email protected]>
commit f1869a890cdedb92a3fab969db5d0fd982850273 upstream.
Tabs on a console with long lines do not wrap properly, so correctly account for the line length when computing the tab placement location.
--- drivers/tty/vt/vt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/tty/vt/vt.c +4 -4
@@ -1725,7 +1725,7 @@ static void reset_terminal(struct vc_datdefault_attr (vc);update_attr (vc); - vc->vc_tab_stop[0 ] =0x01010100 ; + vc->vc_tab_stop[0 ] = vc->vc_tab_stop[1 ] = vc->vc_tab_stop[2 ] = vc->vc_tab_stop[3] =
@@ -1769,7 +1769,7 @@ static void do_con_trol(struct tty_struc vc->vc_pos -= (vc->vc_x <<1 );while (vc->vc_x < vc->vc_cols -1 ) { vc->vc_x++; -if (vc->vc_tab_stop[vc->vc_x >>5 ] & (1 << (vc->vc_x &31 ))) +if (vc->vc_tab_stop[7 & (vc->vc_x >>5 )] & (1 << (vc->vc_x &31 )))break ; } vc->vc_pos += (vc->vc_x <<1 );
@@ -1829,7 +1829,7 @@ static void do_con_trol(struct tty_struclf (vc);return ;case 'H' : - vc->vc_tab_stop[vc->vc_x >>5 ] |= (1 << (vc->vc_x &31 )); + vc->vc_tab_stop[7 & (vc->vc_x >>5 )] |= (1 << (vc->vc_x &31 ));return ;case 'Z' :respond_ID (tty);
@@ -2022,7 +2022,7 @@ static void do_con_trol(struct tty_strucreturn ;case 'g' :if (!vc->vc_par[0 ]) - vc->vc_tab_stop[vc->vc_x >>5 ] &= ~(1 << (vc->vc_x &31 )); + vc->vc_tab_stop[7 & (vc->vc_x >>5 )] &= ~(1 << (vc->vc_x &31 ));else if (vc->vc_par[0 ] ==3 ) { vc->vc_tab_stop[0 ] = vc->vc_tab_stop[1] =
Patches currently in stable-queue which might be from [email protected] are
queue-4.14/mm-khugepaged.c-convert-vm_bug_on-to-collapse-fail.patch queue-4.14/tty-vt-fix-up-tabstops-properly.patch queue-4.14/x86-entry-64-don-t-use-ist-entry-for-bp-stack.patch queue-4.14/selftests-x86-ptrace_syscall-fix-for-yet-more-glibc-interference.patch queue-4.14/posix-timers-protect-posix-clock-array-access-against-speculation.patch queue-4.14/h8300-remove-extraneous-__big_endian-definition.patch queue-4.14/revert-mm-page_alloc-skip-over-regions-of-invalid-pfns-where-possible.patch queue-4.14/mm-thp-do-not-wait-for-lock_page-in-deferred_split_scan.patch queue-4.14/hugetlbfs-check-for-pgoff-value-overflow.patch queue-4.14/lockdep-fix-fs_reclaim-warning.patch queue-4.14/mm-vmscan-wake-up-flushers-for-legacy-cgroups-too.patch queue-4.14/mm-vmalloc-add-interfaces-to-free-unmapped-page-table.patch queue-4.14/kvm-x86-fix-icebp-instruction-handling.patch queue-4.14/mm-shmem-do-not-wait-for-lock_page-in-shmem_unused_huge_shrink.patch queue-4.14/x86-mm-implement-free-pmd-pte-page-interfaces.patch