diff mbox

serial: amba-pl011: fix incorrect integer size in pl011_fifo_to_tty()

Message ID 1444249636-25661-1-git-send-email-timur@codeaurora.org (mailing list archive)
State New, archived
Headers show

Commit Message

Timur Tabi Oct. 7, 2015, 8:27 p.m. UTC
The UART_DUMMY_DR_RX status bit is equal to (1 << 16), so a u16 is too small
to hold that value.  The result is that UART_DUMMY_DR_RX is never passed
to uart_insert_char().  This means that we're always accepting characters,
even when CREAD (in termios) is not set.

Signed-off-by: Timur Tabi <timur@codeaurora.org>
---
 drivers/tty/serial/amba-pl011.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Dave Martin Oct. 16, 2015, 12:48 p.m. UTC | #1
On Wed, Oct 07, 2015 at 03:27:16PM -0500, Timur Tabi wrote:
> The UART_DUMMY_DR_RX status bit is equal to (1 << 16), so a u16 is too small
> to hold that value.  The result is that UART_DUMMY_DR_RX is never passed
> to uart_insert_char().  This means that we're always accepting characters,
> even when CREAD (in termios) is not set.
> 
> Signed-off-by: Timur Tabi <timur@codeaurora.org>
> ---
>  drivers/tty/serial/amba-pl011.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
> index fd27e98..899a771 100644
> --- a/drivers/tty/serial/amba-pl011.c
> +++ b/drivers/tty/serial/amba-pl011.c
> @@ -191,8 +191,8 @@ struct uart_amba_port {
>   */
>  static int pl011_fifo_to_tty(struct uart_amba_port *uap)
>  {
> -	u16 status, ch;
> -	unsigned int flag, max_count = 256;
> +	u16 status;
> +	unsigned int ch, flag, max_count = 256;
>  	int fifotaken = 0;

FWIW,

Reviewed-by: Dave Martin <Dave.Martin@arm.com>

I guess this tells us something about how often !CREAD is used...

Cheers
---Dave
Linus Walleij Oct. 23, 2015, 10:04 a.m. UTC | #2
On Wed, Oct 7, 2015 at 10:27 PM, Timur Tabi <timur@codeaurora.org> wrote:

> The UART_DUMMY_DR_RX status bit is equal to (1 << 16), so a u16 is too small
> to hold that value.  The result is that UART_DUMMY_DR_RX is never passed
> to uart_insert_char().  This means that we're always accepting characters,
> even when CREAD (in termios) is not set.
>
> Signed-off-by: Timur Tabi <timur@codeaurora.org>

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

Yours,
Linus Walleij
diff mbox

Patch

diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
index fd27e98..899a771 100644
--- a/drivers/tty/serial/amba-pl011.c
+++ b/drivers/tty/serial/amba-pl011.c
@@ -191,8 +191,8 @@  struct uart_amba_port {
  */
 static int pl011_fifo_to_tty(struct uart_amba_port *uap)
 {
-	u16 status, ch;
-	unsigned int flag, max_count = 256;
+	u16 status;
+	unsigned int ch, flag, max_count = 256;
 	int fifotaken = 0;
 
 	while (max_count--) {