Skip to contentSkip to conversation

char: tty3270: fix a missing check on list iterator

PATCH In review Xiaomeng Tong 2 participants 3 messages Mar 27, 2022 – Mar 28, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 char: tty3270: fix a missing check on list iterator

The bug is here:

	if (s->len != flen) {

The list iterator 's' will point to a bogus position containing HEAD if the list is empty or no element is found. This case must be checked before any use of the iterator, otherwise it may bpass the 'if (s->len != flen) {' in theory iif s->len's value is flen.

To fix this bug, use a new variable 'iter' as the list iterator, while use the origin variable 's' as a dedicated pointer to point to the found element.

Fixes ^1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 drivers/s390/char/tty3270.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/s390/char/tty3270.c +6 -4
index 5c83f71c1d0e..030e9a098d11 100644
@@ -1111,7 +1111,7 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 {
 	struct tty3270_line *line;
 	struct tty3270_cell *cell;
-	struct string *s, *n;
+	struct string *s = NULL, *n, *iter;
 	unsigned char highlight;
 	unsigned char f_color;
 	char *cp;
@@ -1142,13 +1142,15 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 
 	/* Find the line in the list. */
 	i = tp->view.rows - 2 - line_nr;
-	list_for_each_entry_reverse(s, &tp->lines, list)
-		if (--i <= 0)
+	list_for_each_entry_reverse(iter, &tp->lines, list)
+		if (--i <= 0) {
+			s = iter;
 			break;
+		}
 	/*
 	 * Check if the line needs to get reallocated.
 	 */
-	if (s->len != flen) {
+	if (!s || s->len != flen) {
 		/* Reallocate string. */
 		n = tty3270_alloc_string(tp, flen);
 		list_add(&n->list, &s->list);
Signature · 1 line
2.17.1
reviewer
#1 lore raw
Quoted 6 lines · Xiaomeng Tong

The bug is here:

	if (s->len != flen) {

The list iterator 's' will point to a bogus position containing HEAD if the list is empty or no element is found. This case must be checked before any use of the iterator, otherwise it may bpass

                                                      bypass? ^^^^^
Quoted 1 line

the 'if (s->len != flen) {' in theory iif s->len's value is flen.

                                        ^^^ if?
Quoted 3 lines

To fix this bug, use a new variable 'iter' as the list iterator, while use the origin variable 's' as a dedicated pointer to

using? ^^^

Quoted 28 lines

point to the found element.

Fixes ^1da177e4c3f4 ("Linux-2.6.12-rc2")
---
 drivers/s390/char/tty3270.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/s390/char/tty3270.c +1 -3
index 5c83f71c1d0e..030e9a098d11 100644
@@ -1111,7 +1111,7 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 {
 	struct tty3270_line *line;
 	struct tty3270_cell *cell;
-	struct string *s, *n;
+	struct string *s = NULL, *n, *iter;
 	unsigned char highlight;
 	unsigned char f_color;
 	char *cp;
@@ -1142,13 +1142,15 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 
 	/* Find the line in the list. */
 	i = tp->view.rows - 2 - line_nr;
-	list_for_each_entry_reverse(s, &tp->lines, list)
-		if (--i <= 0)

drivers/s390/char/tty3270.c tty3270_convert_line(struct tty3270 *tp, int line_nr) · line 1153

Quoted 10 lines
drivers/s390/char/tty3270.c +5 -1
+	list_for_each_entry_reverse(iter, &tp->lines, list)
+		if (--i <= 0) {
+			s = iter;
 			break;
+		}
 	/*
 	 * Check if the line needs to get reallocated.
 	 */
-	if (s->len != flen) {
+	if (!s || s->len != flen) {

This doesn't look right. You're checking for s == NULL here

drivers/s390/char/tty3270.c tty3270_convert_line(struct tty3270 *tp, int line_nr) · line 1156

Quoted 3 lines
drivers/s390/char/tty3270.c +0 -0
 		/* Reallocate string. */
 		n = tty3270_alloc_string(tp, flen);
 		list_add(&n->list, &s->list);

and if it is NULL, list_add() would be called here.

#2 lore raw
Quoted 32 lines · Sven Schnelle
Quoted 19 lines
drivers/s390/char/tty3270.c +1 -3
index 5c83f71c1d0e..030e9a098d11 100644
@@ -1111,7 +1111,7 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 {
 	struct tty3270_line *line;
 	struct tty3270_cell *cell;
-	struct string *s, *n;
+	struct string *s = NULL, *n, *iter;
 	unsigned char highlight;
 	unsigned char f_color;
 	char *cp;
@@ -1142,13 +1142,15 @@ tty3270_convert_line(struct tty3270 *tp, int line_nr)
 
 	/* Find the line in the list. */
 	i = tp->view.rows - 2 - line_nr;
-	list_for_each_entry_reverse(s, &tp->lines, list)
-		if (--i <= 0)

drivers/s390/char/tty3270.c tty3270_convert_line(struct tty3270 *tp, int line_nr) · line 1153

Quoted 10 lines
drivers/s390/char/tty3270.c +5 -1
+	list_for_each_entry_reverse(iter, &tp->lines, list)
+		if (--i <= 0) {
+			s = iter;
 			break;
+		}
 	/*
 	 * Check if the line needs to get reallocated.
 	 */
-	if (s->len != flen) {
+	if (!s || s->len != flen) {

This doesn't look right. You're checking for s == NULL here

Quoted 5 lines

drivers/s390/char/tty3270.c tty3270_convert_line(struct tty3270 *tp, int line_nr) · line 1156

Quoted 3 lines
drivers/s390/char/tty3270.c +0 -0
 		/* Reallocate string. */
 		n = tty3270_alloc_string(tp, flen);
 		list_add(&n->list, &s->list);

and if it is NULL, list_add() would be called here.

Yes, you are right, i have submitted PATCH v2 to fix it, thank you.

--
Xiaomeng Tong