drivers/serial/serial_core.c: prevent reading uninitialized stack memory
PATCH 3/3 drivers/serial/serial_core.c: prevent reading uninitialized stack memory
From: Dan Rosenberg <[email protected]>
The TIOCGICOUNT device ioctl allows unprivileged users to read uninitialized stack memory, because the "reserved" member of the serial_icounter_struct struct declared on the stack is not altered or zeroed before being copied back to the user. This patch takes care of it.
---
drivers/serial/serial_core.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/serial/serial_core.c renamed from drivers/serial/serial_core.c~drivers-serial-serial_corec-prevent-reading-uninitialized-stack-memory +2 -0
@@ -1081,6 +1081,8 @@ static int uart_get_icount(struct tty_ststruct uart_icount cnow;struct uart_port *uport = state->uart_port; +memset (&icount,0 ,sizeof (struct serial_icounter_struct )); +spin_lock_irq (&uport->lock);memcpy (&cnow, &uport->icount,sizeof (struct uart_icount ));spin_unlock_irq (&uport->lock);
_
Quoted 20 lines · On Fri, Oct 01, 2010 at 02:18:04PM -0700, [email protected] wrote:
From: Dan Rosenberg <[email protected]>
The TIOCGICOUNT device ioctl allows unprivileged users to read uninitialized stack memory, because the "reserved" member of the
serial_icounter_structstruct declared on the stack is not altered or zeroed before being copied back to the user. This patch takes care of it.Signed-off-by Dan Rosenberg <[email protected]>Cc Alan Cox <[email protected]>Cc Greg KH <[email protected]>Signed-off-by Andrew Morton <[email protected]>---
drivers/serial/serial_core.c | 2 ++ 1 file changed, 2 insertions(+)diff -puN
drivers/serial/serial_core.c~drivers-serial-serial_corec-prevent-reading-uninitialized-stack-memorydrivers/serial/serial_core.c
drivers/serial/serial_core.c static int uart_get_icount(struct tty_st · line 1084
Quoted 4 lines
drivers/serial/serial_core.c renamed from drivers/serial/serial_core.c~drivers-serial-serial_corec-prevent-reading-uninitialized-stack-memory +1
-0@@ -1081,6 +1081,8 @@ static int uart_get_icount(struct tty_ststruct uart_icount cnow;struct uart_port *uport = state->uart_port; +memset (&icount,0 ,sizeof (struct serial_icounter_struct ));
This patch is no longer needed as Alan fixed it in the tty core.
thanks,
greg k-h