提交 8a5a90a2 编写于 作者: A Arnd Bergmann 提交者: Greg Kroah-Hartman

tty: fix __tty_insert_flip_char regression

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: 979990c6 ("tty: improve tty_insert_flip_char() fast path")
Reported-by: NSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Tested-by: NSergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: NArnd Bergmann <arnd@arndb.de>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 065ea0a7
...@@ -372,12 +372,13 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags); ...@@ -372,12 +372,13 @@ EXPORT_SYMBOL(tty_insert_flip_string_flags);
*/ */
int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag) int __tty_insert_flip_char(struct tty_port *port, unsigned char ch, char flag)
{ {
struct tty_buffer *tb = port->buf.tail; struct tty_buffer *tb;
int flags = (flag == TTY_NORMAL) ? TTYB_NORMAL : 0; int flags = (flag == TTY_NORMAL) ? TTYB_NORMAL : 0;
if (!__tty_buffer_request_room(port, 1, flags)) if (!__tty_buffer_request_room(port, 1, flags))
return 0; return 0;
tb = port->buf.tail;
if (~tb->flags & TTYB_NORMAL) if (~tb->flags & TTYB_NORMAL)
*flag_buf_ptr(tb, tb->used) = flag; *flag_buf_ptr(tb, tb->used) = flag;
*char_buf_ptr(tb, tb->used++) = ch; *char_buf_ptr(tb, tb->used++) = ch;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册