[src/trunk]: src/sys/compat/linux/common linux_termio c_cc array should be in...

[chs <chs%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/9266574aa368
branches:  trunk
changeset: 769884:9266574aa368
user:      chs <chs%NetBSD.org@localhost>
date:      Sun Sep 25 13:40:07 2011 +0000

description:
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.

diffstat:

 sys/compat/linux/common/linux_termios.h |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (35 lines):

diff -r 29d5a7c9a878 -r 9266574aa368 sys/compat/linux/common/linux_termios.h
--- a/sys/compat/linux/common/linux_termios.h   Sun Sep 25 13:37:20 2011 +0000
+++ b/sys/compat/linux/common/linux_termios.h   Sun Sep 25 13:40:07 2011 +0000
@@ -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 @@
        }
        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;