patch "serdev: ttyport: add missing receive_buf sanity checks" added to tty-linus
Subsystems (3)
This is a note to let you know that I've just added the patch titled
serdev: ttyport: add missing receive_buf sanity checks
to my tty git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
in the tty-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
eb281683621b71ab9710d9dccbbef0c2e1769c97Mon Sep 17 00:00:00 2001
From: Johan Hovold <[email protected]>
Date: Fri, 3 Nov 2017 15:30:52 +0100
Subject: serdev: ttyport: add missing receive_buf sanity checks
The receive_buf tty-port callback should return the number of bytes accepted and must specifically never return a negative errno (or a value larger than the buffer size) to the tty layer.
A serdev driver not providing a receive_buf callback would currently cause the flush_to_ldisc() worker to spin in a tight loop when the tty buffer pointers are incremented with -EINVAL (-22) after data has been received.
A serdev driver occasionally returning a negative errno (or a too large byte count) could cause information leaks or crashes when accessing memory outside the tty buffers in consecutive callbacks.
--- drivers/tty/serdev/serdev-ttyport.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/tty/serdev/serdev-ttyport.c +12 -1
@@ -27,11 +27,22 @@ static int ttyport_receive_buf(struct tty_port *port, const unsigned char *cp, {struct serdev_controller *ctrl = port->client_data;struct serport *serport =serdev_controller_get_drvdata (ctrl); +int ret;if (!test_bit (SERPORT_ACTIVE , &serport->flags))return 0 ; -return serdev_controller_receive_buf (ctrl, cp, count); + ret =serdev_controller_receive_buf (ctrl, cp, count); + +dev_WARN_ONCE (&ctrl->dev, ret <0 || ret > count, +"receive_buf returns %d (count = %zu)\n" , + ret, count); +if (ret <0 ) +return 0 ; +else if (ret > count) +return count; + +return ret; }static void ttyport_write_wakeup (struct tty_port *port)
Signature · 1 line
2.15.0