Re: [uml-devel] Re: Bug#260111: user-mode-linux: upgrade hangs at "NET4: Linux TCP/IP 1.0 for NET4.0 "

[Matt Clay <mattclay@hevanet.com>]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

Matt Clay wrote:
> 
> This patch seems to fix the problem by adding error handling to
> the tcsetattr call in generic_console_write.

Looks like pasting the patch inline wasn't a good idea.  I've attached the 
patch this time.

  - Matt

[-- Attachment #2: tcsetattr_check --]
[-- Type: text/plain, Size: 616 bytes --]

--- um.orig/arch/um/drivers/chan_kern.c	2004-07-26 11:43:52.000000000 -0700
+++ um/arch/um/drivers/chan_kern.c	2004-07-31 19:38:51.000000000 -0700
@@ -117,15 +117,15 @@
 {
 	struct termios save, new;
 	int err;
+	int changed = 0;
 
-	if(isatty(fd)){
-		tcgetattr(fd, &save);
+	if(isatty(fd) && tcgetattr(fd, &save) == 0) {
 		new = save;
 		new.c_oflag |= OPOST;
-		tcsetattr(fd, TCSAFLUSH, &new);
+		if(tcsetattr(fd, TCSAFLUSH, &new) == 0) changed = 1;
 	}
 	err = generic_write(fd, buf, n, NULL);
-	if(isatty(fd)) tcsetattr(fd, TCSAFLUSH, &save);
+	if(changed) tcsetattr(fd, TCSAFLUSH, &save);
 	return(err);
 }