From: Ameen Ali <ameenali023@gmail.com>
To: jslaby@suse.cz, tiwai@suse.de, joe@perches.com
Cc: linux-kernel@vger.kernel.org, Ameen Ali <ameenali023@gmail.com>
Subject: [PATCH 14/14] drivers/tty/vt/vt.c : access out-of-bounds
Date: Sat, 14 Mar 2015 14:46:22 +0200 [thread overview]
Message-ID: <1426337182-4790-1-git-send-email-ameenali023@gmail.com> (raw)
make sure that out-of-bounds never happens
Signed-off-by : Ameen Ali <AmeenAli023@gmail.com>
---
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
next reply other threads:[~2015-03-14 12:46 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-14 12:46 Ameen Ali [this message]
2015-03-14 15:58 ` [PATCH 14/14] drivers/tty/vt/vt.c : access out-of-bounds Richard Weinberger
2015-03-16 14:22 ` One Thousand Gnomes
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=1426337182-4790-1-git-send-email-ameenali023@gmail.com \
--to=ameenali023@gmail.com \
--cc=joe@perches.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=tiwai@suse.de \
/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;
as well as URLs for NNTP newsgroup(s).