Module Name: src
Committed By: chs
Date: Sun Sep 25 13:40:07 UTC 2011
Modified Files:
src/sys/compat/linux/common: linux_termios.h
Log Message:
linux_termio c_cc array should be indexed by LINUX_OLD_V* rather than LINUX_V*.
fixes array overrun on alpha noticed by gcc 4.5.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/compat/linux/common/linux_termios.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_termios.h
diff -u src/sys/compat/linux/common/linux_termios.h:1.20 src/sys/compat/linux/common/linux_termios.h:1.21
--- src/sys/compat/linux/common/linux_termios.h:1.20 Mon Jul 4 12:39:36 2011
+++ src/sys/compat/linux/common/linux_termios.h Sun Sep 25 13:40:07 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_termios.h,v 1.20 2011/07/04 12:39:36 mrg Exp $ */
+/* $NetBSD: linux_termios.h,v 1.21 2011/09/25 13:40:07 chs Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -345,16 +345,16 @@ bsd_termios_to_linux_termio(struct termi
}
lt->c_cflag |= mask;
- lt->c_cc[LINUX_VINTR] = bts->c_cc[VINTR];
- lt->c_cc[LINUX_VQUIT] = bts->c_cc[VQUIT];
- lt->c_cc[LINUX_VERASE] = bts->c_cc[VERASE];
- lt->c_cc[LINUX_VKILL] = bts->c_cc[VKILL];
-#if LINUX_VEOF < LINUX_NCC
- lt->c_cc[LINUX_VEOF] = bts->c_cc[VEOF];
+ lt->c_cc[LINUX_OLD_VINTR] = bts->c_cc[VINTR];
+ lt->c_cc[LINUX_OLD_VQUIT] = bts->c_cc[VQUIT];
+ lt->c_cc[LINUX_OLD_VERASE] = bts->c_cc[VERASE];
+ lt->c_cc[LINUX_OLD_VKILL] = bts->c_cc[VKILL];
+#if LINUX_OLD_VEOF < LINUX_NCC
+ lt->c_cc[LINUX_OLD_VEOF] = bts->c_cc[VEOF];
#endif
- lt->c_cc[LINUX_VTIME] = bts->c_cc[VTIME];
- lt->c_cc[LINUX_VMIN] = bts->c_cc[VMIN];
- lt->c_cc[LINUX_VSWTC] = 0;
+ lt->c_cc[LINUX_OLD_VTIME] = bts->c_cc[VTIME];
+ lt->c_cc[LINUX_OLD_VMIN] = bts->c_cc[VMIN];
+ lt->c_cc[LINUX_OLD_VSWTC] = 0;
/* XXX should be fixed someday */
lt->c_line = 0;
