Skip to contentSkip to conversation

drivers/tty/vt/vt.c : access out-of-bounds

PATCH In review Ameen Ali 3 participants 3 messages Mar 14, 2015 – Mar 16, 2015 TTY layer and serial drivers

lore
Share & tools
lore

Ameen Ali

author
#0 lore raw

PATCH 14/14 drivers/tty/vt/vt.c : access out-of-bounds

make sure that out-of-bounds never happens

---
 drivers/tty/vt/vt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +8 -8
index 6e00572..cf73e92 100644
@@ -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],
Signature · 1 line
2.1.0
#1 lore raw
Quoted 1 line · Ameen Ali

make sure that out-of-bounds never happens

Can it actually happen?
Isn't i guaranteed to be within bounds?

Quoted 53 lines
---
 drivers/tty/vt/vt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +8 -9
index 6e00572..cf73e92 100644
@@ -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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Signature · 2 lines
Thanks,
//richard
#2 lore raw
In reply to Ameen Ali
Quoted 12 lines · On Sat, 14 Mar 2015 14:46:22 +0200 Ameen Ali <[email protected]> wrote:

make sure that out-of-bounds never happens

---
 drivers/tty/vt/vt.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +0 -0
index 6e00572..cf73e92 100644

drivers/tty/vt/vt.c static void csi_m(struct vc_data *vc) · line 1366

Quoted 3 lines
drivers/tty/vt/vt.c +0 -0
@@ -1364,13 +1364,13 @@ static void csi_m(struct vc_data *vc)
 				i++;
 				if (i > vc->vc_npar)
 					break;

It's checked in advance ^^^^^^^^^^^^^^^^^^^^^^^^^^

I guess whatever tool you used to verify it is concerned about the case of i == vc->vc_npar ?

Alan