From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932081AbbCNMql (ORCPT ); Sat, 14 Mar 2015 08:46:41 -0400 Received: from mail-wi0-f171.google.com ([209.85.212.171]:35636 "EHLO mail-wi0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753059AbbCNMqh (ORCPT ); Sat, 14 Mar 2015 08:46:37 -0400 From: Ameen Ali To: jslaby@suse.cz, tiwai@suse.de, joe@perches.com Cc: linux-kernel@vger.kernel.org, Ameen Ali Subject: [PATCH 14/14] drivers/tty/vt/vt.c : access out-of-bounds Date: Sat, 14 Mar 2015 14:46:22 +0200 Message-Id: <1426337182-4790-1-git-send-email-ameenali023@gmail.com> X-Mailer: git-send-email 2.1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org make sure that out-of-bounds never happens Signed-off-by : Ameen Ali --- drivers/tty/vt/vt.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index 6e00572..cf73e92 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c @@ -1364,13 +1364,13 @@ static void csi_m(struct vc_data *vc) i++; if (i > vc->vc_npar) break; - if (vc->vc_par[i] == 5 && /* 256 colours */ - i < vc->vc_npar) { /* ubiquitous */ + if (i < vc->vc_npar && /* 256 colours */ + vc->vc_par[i] == 5) { /* ubiquitous */ i++; rgb_foreground(vc, rgb_from_256(vc->vc_par[i])); - } else if (vc->vc_par[i] == 2 && /* 24 bit */ - i <= vc->vc_npar + 3) {/* extremely rare */ + } else if (i <= vc->vc_npar + 3 && /* 24 bit */ + vc->vc_par[i] == 2) {/* extremely rare */ struct rgb c = { .r = vc->vc_par[i + 1], .g = vc->vc_par[i + 2], @@ -1387,13 +1387,13 @@ static void csi_m(struct vc_data *vc) i++; if (i > vc->vc_npar) break; - if (vc->vc_par[i] == 5 && /* 256 colours */ - i < vc->vc_npar) { + if (i < vc->vc_npar && /* 256 colours */ + vc->vc_par[i] == 5) { i++; rgb_background(vc, rgb_from_256(vc->vc_par[i])); - } else if (vc->vc_par[i] == 2 && /* 24 bit */ - i <= vc->vc_npar + 3) { + } else if (i <= vc->vc_npar + 3 && /* 24 bit */ + vc->vc_par[i] == 2 ) { struct rgb c = { .r = vc->vc_par[i + 1], .g = vc->vc_par[i + 2], -- 2.1.0