Skip to content

Commit c13c5c7

Browse files
arndbgregkh
authored andcommitted
tty: fix __tty_insert_flip_char regression
commit 8a5a90a2a477b86a3dc2eaa5a706db9bfdd647ca upstream. Sergey noticed a small but fatal mistake in __tty_insert_flip_char, leading to an oops in an interrupt handler when using any serial port. The problem is that I accidentally took the tty_buffer pointer before calling __tty_buffer_request_room(), which replaces the buffer. This moves the pointer lookup to the right place after allocating the new buffer space. Fixes: 979990c62848 ("tty: improve tty_insert_flip_char() fast path") Reported-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Tested-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 077933d commit c13c5c7

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/tty/tty_buffer.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,12 +372,13 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
372372
*/
373373
int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag)
374374
{
375-
struct tty_buffer *tb = port->buf.tail;
375+
struct tty_buffer *tb;
376376
int flags = (flag == TTY_NORMAL) ? TTYB_NORMAL : 0;
377377

378378
if (!__tty_buffer_request_room(port, 1, flags))
379379
return 0;
380380

381+
tb = port->buf.tail;
381382
if (~tb->flags & TTYB_NORMAL)
382383
*flag_buf_ptr(tb, tb->used) = flag;
383384
*char_buf_ptr(tb, tb->used++) = ch;

0 commit comments

Comments
 (0)