linux.git/drivers/tty/vt/vt.c, branch v4.17

Merge tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2018-04-05T01:43:49+00:00

Pull tty/serial driver updates from Greg KH:
 "Here is the big set of tty and serial driver patches for 4.17-rc1

  Not all that big really, most are just small fixes and additions to
  existing drivers. There's a bunch of work on the imx serial driver
  recently for some reason, and a new embedded serial driver added as
  well.

  Full details are in the shortlog.

  All of these have been in the linux-next tree for a while with no
  reported issues"

* tag 'tty-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (66 commits)
  serial: expose buf_overrun count through proc interface
  serial: mvebu-uart: fix tx lost characters
  tty: serial: msm_geni_serial: Fix return value check in qcom_geni_serial_probe()
  tty: serial: msm_geni_serial: Add serial driver support for GENI based QUP
  8250-men-mcb: add support for 16z025 and 16z057
  powerpc: Mark the variable earlycon_acpi_spcr_enable maybe_unused
  serial: stm32: fix initialization of RS485 mode
  ARM: dts: STi: Remove "console=ttyASN" from bootargs for STi boards
  vt: change SGR 21 to follow the standards
  serdev: Fix typo in serdev_device_alloc
  ARM: dts: STi: Fix aliases property name for STi boards
  tty: st-asc: Update tty alias
  serial: stm32: add support for RS485 hardware control mode
  dt-bindings: serial: stm32: add RS485 optional properties
  selftests: add devpts selftests
  devpts: comment devpts_mntget()
  devpts: resolve devpts bind-mounts
  devpts: hoist out check for DEVPTS_SUPER_MAGIC
  serial: 8250: Add Nuvoton NPCM UART
  serial: mxs-auart: disable clks of Alphascale ASM9260
  ...

tty: vt: fix up tabstops properly

2018-03-25T17:04:00+00:00

Tabs on a console with long lines do not wrap properly, so correctly
account for the line length when computing the tab placement location.

Reported-by: James Holderness 
Signed-off-by: Greg Kroah-Hartman 
Cc: stable 
Signed-off-by: Linus Torvalds

vt: change SGR 21 to follow the standards

2018-03-14T16:58:44+00:00

ECMA-48 [1] (aka ISO 6429) has defined SGR 21 as "doubly underlined"
since at least March 1984.  The Linux kernel has treated it as SGR 22
"normal intensity" since it was added in Linux-0.96b in June 1992.
Before that, it was simply ignored.  Other terminal emulators have
either ignored it, or treat it as double underline now.  xterm for
example added support in its 304 release (May 2014) [2] where it was
previously ignoring it.

Changing this behavior shouldn't be an issue:
- It isn't a named capability in ncurses's terminfo database, so no
  script is using libtinfo/libcurses to look this up, or using tput
  to query & output the right sequence.
- Any script assuming SGR 21 will reset intensity in all terminals
  already do not work correctly on non-Linux VTs (including running
  under screen/tmux/etc...).
- If someone has written a script that only runs in the Linux VT, and
  they're using SGR 21 (instead of SGR 22), the output should still
  be readable.

imo it's important to change this as the Linux VT's non-conformance
is sometimes used as an argument for other terminal emulators to not
implement SGR 21 at all, or do so incorrectly.

[1]: https://www.ecma-international.org/publications/standards/Ecma-048.htm
[2]: https://github.com/ThomasDickey/xterm-snapshots/commit/2fd29cb98d214cb536bcafbee00bc73b3f1eeb9d

Signed-off-by: Mike Frysinger 
Cc: stable 
Signed-off-by: Greg Kroah-Hartman

treewide: Switch DEFINE_TIMER callbacks to struct timer_list *

2017-11-21T23:57:05+00:00

This changes all DEFINE_TIMER() callbacks to use a struct timer_list
pointer instead of unsigned long. Since the data argument has already been
removed, none of these callbacks are using their argument currently, so
this renames the argument to "unused".

Done using the following semantic patch:

@match_define_timer@
declarer name DEFINE_TIMER;
identifier _timer, _callback;
@@

 DEFINE_TIMER(_timer, _callback);

@change_callback depends on match_define_timer@
identifier match_define_timer._callback;
type _origtype;
identifier _origarg;
@@

 void
-_callback(_origtype _origarg)
+_callback(struct timer_list *unused)
 { ... }

Signed-off-by: Kees Cook

Merge tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

2017-11-14T05:05:31+00:00

Pull tty/serial updates from Greg KH:
 "Here is the big tty/serial driver pull request for 4.15-rc1.

  Lots of serial driver updates in here, some small vt cleanups, and a
  raft of SPDX and license boilerplate cleanups, messing up the diffstat
  a bit.

  Nothing major, with no realy functional changes except better hardware
  support for some platforms.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'tty-4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (110 commits)
  tty: ehv_bytechan: fix spelling mistake
  tty: serial: meson: allow baud-rates lower than 9600
  serial: 8250_fintek: Fix crash with baud rate B0
  serial: 8250_fintek: Disable delays for ports != 0
  serial: 8250_fintek: Return -EINVAL on invalid configuration
  tty: Remove redundant license text
  tty: serdev: Remove redundant license text
  tty: hvc: Remove redundant license text
  tty: serial: Remove redundant license text
  tty: add SPDX identifiers to all remaining files in drivers/tty/
  tty: serial: jsm: remove redundant pointer ts
  tty: serial: jsm: add space before the open parenthesis '('
  tty: serial: jsm: fix coding style
  tty: serial: jsm: delete space between function name and '('
  tty: serial: jsm: add blank line after declarations
  tty: serial: jsm: change the type of local variable
  tty: serial: imx: remove dead code imx_dma_rxint
  tty: serial: imx: disable ageing timer interrupt if dma in use
  serial: 8250: fix potential deadlock in rs485-mode
  serial: m32r_sio: Drop redundant .data assignment
  ...

tty: add SPDX identifiers to all remaining files in drivers/tty/

2017-11-08T12:08:12+00:00

It's good to have SPDX identifiers in all files to make it easier to
audit the kernel tree for correct licenses.

Update the drivers/tty files files with the correct SPDX license
identifier based on the license text in the file itself.  The SPDX
identifier is a legally binding shorthand, which can be used instead of
the full boiler plate text.

This work is based on a script and data from Thomas Gleixner, Philippe
Ombredanne, and Kate Stewart.

Cc: Jiri Slaby 
Cc: Benjamin Herrenschmidt 
Cc: Paul Mackerras 
Cc: Michael Ellerman 
Cc: Chris Metcalf 
Cc: Jiri Kosina 
Cc: David Sterba 
Cc: James Hogan 
Cc: Rob Herring 
Cc: Eric Anholt 
Cc: Stefan Wahren 
Cc: Florian Fainelli 
Cc: Ray Jui 
Cc: Scott Branden 
Cc: bcm-kernel-feedback-list@broadcom.com
Cc: "James E.J. Bottomley" 
Cc: Helge Deller 
Cc: Joachim Eastwood 
Cc: Matthias Brugger 
Cc: Masahiro Yamada 
Cc: Tobias Klauser 
Cc: Russell King 
Cc: Vineet Gupta 
Cc: Richard Genoud 
Cc: Alexander Shiyan 
Cc: Baruch Siach 
Cc: "Maciej W. Rozycki" 
Cc: "Uwe Kleine-König" 
Cc: Pat Gefre 
Cc: "Guilherme G. Piccoli" 
Cc: Jason Wessel 
Cc: Vladimir Zapolskiy 
Cc: Sylvain Lemieux 
Cc: Carlo Caione 
Cc: Kevin Hilman 
Cc: Liviu Dudau 
Cc: Sudeep Holla 
Cc: Lorenzo Pieralisi 
Cc: Andy Gross 
Cc: David Brown 
Cc: "Andreas Färber" 
Cc: Kevin Cernekee 
Cc: Laxman Dewangan 
Cc: Thierry Reding 
Cc: Jonathan Hunter 
Cc: Barry Song 
Cc: Patrice Chotard 
Cc: Maxime Coquelin 
Cc: Alexandre Torgue 
Cc: "David S. Miller" 
Cc: Peter Korsgaard 
Cc: Timur Tabi 
Cc: Tony Prisk 
Cc: Michal Simek 
Cc: "Sören Brinkmann" 
Cc: Thomas Gleixner 
Cc: Kate Stewart 
Cc: Philippe Ombredanne 
Cc: Jiri Slaby 
Signed-off-by: Greg Kroah-Hartman

tty: vt: remove multi-fetch, derive font.height from font.data

2017-10-20T12:06:45+00:00

In con_font_set(), when we need to guess font height (for
compat reasons?), the current approach uses multiple userspace
fetches, i.e., get_user(tmp, &charmap[32*i+h-1]), to derive
the height. This has two drawbacks:

1. performance: accessing userspace memory is less efficient than
directly de-reference the byte

2. security: a more critical problem is that the height derived
might not match with the actual font.data. This is because a user
thread might race condition to change the memory of op->data after
the op->height guessing but before the second fetch: font.data =
memdup_user(op->data, size). Leaving font.height = 32 while the
actual height is 1 or vice-versa.

This patch tries to resolve both issues by re-locating the height
guessing part after the font.data is fetched in. In this way, the
userspace data is fetched in one shot and we directly dereference
the font.data in kernel space to probe for the height.

Signed-off-by: Meng Xu 
Signed-off-by: Greg Kroah-Hartman

timer: Remove expires and data arguments from DEFINE_TIMER

2017-10-05T13:01:20+00:00

Drop the arguments from the macro and adjust all callers with the
following script:

  perl -pi -e 's/DEFINE_TIMER\((.*), 0, 0\);/DEFINE_TIMER($1);/g;' \
    $(git grep DEFINE_TIMER | cut -d: -f1 | sort -u | grep -v timer.h)

Signed-off-by: Kees Cook 
Acked-by: Geert Uytterhoeven  # for m68k parts
Acked-by: Guenter Roeck  # for watchdog parts
Acked-by: David S. Miller  # for networking parts
Acked-by: Greg Kroah-Hartman 
Acked-by: Kalle Valo  # for wireless parts
Acked-by: Arnd Bergmann 
Cc: linux-mips@linux-mips.org
Cc: Petr Mladek 
Cc: Benjamin Herrenschmidt 
Cc: Lai Jiangshan 
Cc: Sebastian Reichel 
Cc: Kalle Valo 
Cc: Paul Mackerras 
Cc: Pavel Machek 
Cc: linux1394-devel@lists.sourceforge.net
Cc: Chris Metcalf 
Cc: linux-s390@vger.kernel.org
Cc: linux-wireless@vger.kernel.org
Cc: "James E.J. Bottomley" 
Cc: Wim Van Sebroeck 
Cc: Michael Ellerman 
Cc: Ursula Braun 
Cc: Viresh Kumar 
Cc: Harish Patil 
Cc: Stephen Boyd 
Cc: Michael Reed 
Cc: Manish Chopra 
Cc: Len Brown 
Cc: Arnd Bergmann 
Cc: linux-pm@vger.kernel.org
Cc: Heiko Carstens 
Cc: Tejun Heo 
Cc: Julian Wiedmann 
Cc: John Stultz 
Cc: Mark Gross 
Cc: linux-watchdog@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Cc: "Martin K. Petersen" 
Cc: Greg Kroah-Hartman 
Cc: "Rafael J. Wysocki" 
Cc: Oleg Nesterov 
Cc: Ralf Baechle 
Cc: Stefan Richter 
Cc: Guenter Roeck 
Cc: netdev@vger.kernel.org
Cc: Martin Schwidefsky 
Cc: Andrew Morton 
Cc: linuxppc-dev@lists.ozlabs.org
Cc: Sudip Mukherjee 
Link: https://lkml.kernel.org/r/1507159627-127660-11-git-send-email-keescook@chromium.org
Signed-off-by: Thomas Gleixner

vt: Use consistent logging style

2017-10-04T08:52:01+00:00

vt has a mixture of pr_ and printk.
Convert to using only pr_.

Miscellanea:

o Coalesce formats
o Realign arguments
o Add missing braces around an if/else with the printk conversion

Signed-off-by: Joe Perches 
Signed-off-by: Greg Kroah-Hartman

vt: Use bsearch library function in is_double_width

2017-09-18T16:31:48+00:00

Use bsearch library function instead of duplicated functionality.

Signed-off-by: Thomas Meyer 
Signed-off-by: Greg Kroah-Hartman