vt: ignore csi sequences with intermediate characters.

Various csi sequences contain intermediate characters between the
parameters and the final character. Introduce a additional state that
cleanly ignores these sequences.

This allows the vt to ignore these sequences used by more capable
terminal implementations such as "request mode", etc.

Signed-off-by: Martin Hostettler <textshell@uchuujin.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index ec61f83562456460db78cc85dadb6a61cafa28d0..7f340b0aef056ca8dee32581c8603ab5a0c66b4c 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2023,7 +2023,7 @@ static void restore_cur(struct vc_data *vc)
 }
 
 enum { ESnormal, ESesc, ESsquare, ESgetpars, ESfunckey,
-       EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
+       EShash, ESsetG0, ESsetG1, ESpercent, EScsiignore, ESnonstd,
        ESpalette, ESosc };
 
 /* console_lock is held (except via vc_init()) */
@@ -2261,6 +2261,10 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                        vc->vc_par[vc->vc_npar] += c - '0';
                        return;
                }
+               if (c >= 0x20 && c <= 0x2f) {
+                       vc->vc_state = EScsiignore;
+                       return;
+               }
                vc->vc_state = ESnormal;
                switch(c) {
                case 'h':
@@ -2423,6 +2427,11 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
                        return;
                }
                return;
+       case EScsiignore:
+               if (c >= 20 && c <= 0x3f)
+                       return;
+               vc->vc_state = ESnormal;
+               return;
        case ESpercent:
                vc->vc_state = ESnormal;
                switch (c) {