mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2025-01-18 14:25:25 +00:00
serial: omap: Prevent DoS using unprivileged ioctl(TIOCSRS485)
The omap-serial driver emulates RS485 delays using software timers, but neglects to clamp the input values from the unprivileged ioctl(TIOCSRS485). Because the software implementation busy-waits, malicious userspace could stall the cpu for ~49 days. Clamp the input values to < 100ms. Fixes: 4a0ac0f55b18 ("OMAP: add RS485 support") Cc: <stable@vger.kernel.org> # 3.12+ Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
d56edd7ed0
commit
308bbc9ab8
@ -1343,7 +1343,7 @@ static inline void serial_omap_add_console_port(struct uart_omap_port *up)
|
||||
|
||||
/* Enable or disable the rs485 support */
|
||||
static int
|
||||
serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
|
||||
serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485)
|
||||
{
|
||||
struct uart_omap_port *up = to_uart_omap_port(port);
|
||||
unsigned int mode;
|
||||
@ -1356,8 +1356,12 @@ serial_omap_config_rs485(struct uart_port *port, struct serial_rs485 *rs485conf)
|
||||
up->ier = 0;
|
||||
serial_out(up, UART_IER, 0);
|
||||
|
||||
/* Clamp the delays to [0, 100ms] */
|
||||
rs485->delay_rts_before_send = min(rs485->delay_rts_before_send, 100U);
|
||||
rs485->delay_rts_after_send = min(rs485->delay_rts_after_send, 100U);
|
||||
|
||||
/* store new config */
|
||||
port->rs485 = *rs485conf;
|
||||
port->rs485 = *rs485;
|
||||
|
||||
/*
|
||||
* Just as a precaution, only allow rs485
|
||||
|
Loading…
x
Reference in New Issue
Block a user