Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee8b593a authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

TTY: ttyprintk, don't touch behind tty->write_buf 



If a user provides a buffer larger than a tty->write_buf chunk and
passes '\r' at the end of the buffer, we touch an out-of-bound memory.

Add a check there to prevent this.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Cc: stable@vger.kernel.org (everything maintained past v2.6.37)
Cc: Samo Pogacnik <samo_pogacnik@t-2.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f06fb543

drivers/char/ttyprintk.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static int tpk_printk(const unsigned char *buf, int count) 
				tmp[tpk_curr + 1] = '\0';

				printk(KERN_INFO "%s%s", tpk_tag, tmp);

				tpk_curr = 0;

				if (buf[i + 1] == '\n')

				if ((i + 1) < count && buf[i + 1] == '\n')

					i++;

				break;

			case '\n':