public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Adam Borowski <kilobyte@angband.pl>
Cc: Jiri Slaby <jslaby@suse.cz>, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] vt: detect and ignore OSC codes.
Date: Thu, 13 Feb 2014 10:39:12 -0800	[thread overview]
Message-ID: <20140213183912.GA18522@kroah.com> (raw)
In-Reply-To: <1389766864-22673-1-git-send-email-kilobyte@angband.pl>

On Wed, Jan 15, 2014 at 07:21:04AM +0100, Adam Borowski wrote:
> These can be used to send commands consisting of an arbitrary string to the
> terminal, most often used to set a terminal's window title or to redefine
> the colour palette.  Our console doesn't use OSC, unlike everything else,
> which can lead to junk being displayed if a process sends such a code
> unconditionally.
> 
> Not following Ecma-48, this commit recognizes 7-bit forms (ESC ] ... 0x07,
> ESC ] .. ESC \) but not 8-bit (0x9D ... 0x9C).
> 
> Signed-off-by: Adam Borowski <kilobyte@angband.pl>

Where is this documented?


> ---
>  drivers/tty/vt/vt.c | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
> index 61b1137..0377c52 100644
> --- a/drivers/tty/vt/vt.c
> +++ b/drivers/tty/vt/vt.c
> @@ -1590,7 +1590,7 @@ static void restore_cur(struct vc_data *vc)
>  
>  enum { ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
>  	EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
> -	ESpalette };
> +	ESpalette, ESosc };
>  
>  /* console_lock is held (except via vc_init()) */
>  static void reset_terminal(struct vc_data *vc, int do_clear)
> @@ -1650,11 +1650,15 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
>  	 *  Control characters can be used in the _middle_
>  	 *  of an escape sequence.
>  	 */
> +	if (vc->vc_state == ESosc && c>=8 && c<=13) /* ... except for OSC */
> +		return;
>  	switch (c) {
>  	case 0:
>  		return;
>  	case 7:
> -		if (vc->vc_bell_duration)
> +		if (vc->vc_state == ESosc)
> +			vc->vc_state = ESnormal;
> +		else if (vc->vc_bell_duration)
>  			kd_mksound(vc->vc_bell_pitch, vc->vc_bell_duration);
>  		return;
>  	case 8:
> @@ -1765,7 +1769,9 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
>  		} else if (c=='R') {   /* reset palette */
>  			reset_palette(vc);
>  			vc->vc_state = ESnormal;
> -		} else
> +		} else if (c>='0' && c<='9')
> +			vc->vc_state = ESosc;
> +		else
>  			vc->vc_state = ESnormal;
>  		return;
>  	case ESpalette:
> @@ -2023,6 +2029,8 @@ static void do_con_trol(struct tty_struct *tty, struct vc_data *vc, int c)
>  		return;
>  	default:
>  		vc->vc_state = ESnormal;
> +	case ESosc:
> +		return;

Why below the default: case?

thanks,

greg k-h

  reply	other threads:[~2014-02-13 18:37 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-01-15  6:21 [PATCH] vt: detect and ignore OSC codes Adam Borowski
2014-02-13 18:39 ` Greg Kroah-Hartman [this message]
2014-02-16  2:37   ` Adam Borowski
2014-02-18 18:44     ` Greg Kroah-Hartman
2014-02-19  0:38       ` Adam Borowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140213183912.GA18522@kroah.com \
    --to=gregkh@linuxfoundation.org \
    --cc=jslaby@suse.cz \
    --cc=kilobyte@angband.pl \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox