From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtprelay0027.hostedemail.com ([216.40.44.27] helo=smtprelay.hostedemail.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1ciQJn-0005ge-Pu for barebox@lists.infradead.org; Mon, 27 Feb 2017 18:46:45 +0000 References: <20170227075752.nb4rg64glmr67cmw@pengutronix.de> <20170227133930.1230-1-bst@pengutronix.de> From: Ian Abbott Message-ID: <7649641e-ac3b-b184-582e-18400a1d6d45@mev.co.uk> Date: Mon, 27 Feb 2017 18:46:09 +0000 MIME-Version: 1.0 In-Reply-To: <20170227133930.1230-1-bst@pengutronix.de> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: Re: [PATCH v3] fbconsole: check cursor position before moving To: Bastian Stender , Sascha Hauer Cc: barebox@lists.infradead.org On 27/02/17 13:39, Bastian Stender wrote: > Moving the cursor to x=2, y=2 with "\e[3;3H" on a 12x2 framebuffer > console lead to a barebox crash while drawing the cursor. If the > cursor position is out of bounds clip the cursor to the corresponding > edge. > > Signed-off-by: Bastian Stender > --- > drivers/video/fbconsole.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbconsole.c b/drivers/video/fbconsole.c > index 64f7d7364e..33649c597d 100644 > --- a/drivers/video/fbconsole.c > +++ b/drivers/video/fbconsole.c > @@ -264,10 +264,13 @@ static void fbc_parse_csi(struct fbc_priv *priv) > return; > case 'H': > video_invertchar(priv, priv->x, priv->y); > + > pos = simple_strtoul(priv->csi, &end, 10); > - priv->y = pos ? pos - 1 : 0; > + priv->y = clamp(pos - 1, 0, (int) priv->rows); > + That allows priv->y to be set to priv->rows, which is one too many. How about: priv->y = clamp(pos, 1, (int)priv->rows) - 1; ? > pos = simple_strtoul(end + 1, NULL, 10); > - priv->x = pos ? pos - 1 : 0; > + priv->x = clamp(pos - 1, 0, (int) priv->cols); > + Similar to above. > video_invertchar(priv, priv->x, priv->y); > case 'K': > pos = simple_strtoul(priv->csi, &end, 10); > -- -=( Ian Abbott @ MEV Ltd. E-mail: )=- -=( Web: http://www.mev.co.uk/ )=- _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox