Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933895AbZIDTTx (ORCPT ); Fri, 4 Sep 2009 15:19:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933886AbZIDTTw (ORCPT ); Fri, 4 Sep 2009 15:19:52 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:51839 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933854AbZIDTTr (ORCPT ); Fri, 4 Sep 2009 15:19:47 -0400 Date: Fri, 4 Sep 2009 09:19:34 -1000 (HST) From: Linus Torvalds To: Mikael Pettersson cc: "Rafael J. Wysocki" , Linux Kernel Mailing List , Kernel Testers List , Alan Cox , Greg KH , Andrew Morton , OGAWA Hirofumi Subject: Re: [Bug #14015] pty regressed again, breaking expect and gcc's testsuite In-Reply-To: Message-ID: References: <19099.52899.620345.326521@pilspetsen.it.uu.se> <19100.31254.666066.755541@pilspetsen.it.uu.se> <200909012042.59856.rjw@sisk.pl> <19105.5352.28380.230615@pilspetsen.it.uu.se> User-Agent: Alpine 2.00 (LFD 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1314 Lines: 40 On Fri, 4 Sep 2009, Linus Torvalds wrote: > > I'm sure you already figured the obvious meaning out, but here's a fixed > version. And here's another patch that may also fix this, simply by virtue of writing the "\r\n" as a single string, rather than as two characters. That way, we should never get into the situation that th '\r' allocates a new buffer (larger than one character), and then the later '\n' writing decides that we've filled up. Besides, it's a cleanup. An untested one, naturally. Linus --- drivers/char/n_tty.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/char/n_tty.c b/drivers/char/n_tty.c index 973be2f..4e28b35 100644 --- a/drivers/char/n_tty.c +++ b/drivers/char/n_tty.c @@ -300,8 +300,7 @@ static int do_output_char(unsigned char c, struct tty_struct *tty, int space) if (space < 2) return -1; tty->canon_column = tty->column = 0; - tty_put_char(tty, '\r'); - tty_put_char(tty, c); + tty->ops->write(tty, "\r\n", 2); return 2; } tty->canon_column = tty->column; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/