Skip to contentSkip to conversation

tty: Fix out-of-bound vmalloc access in imageblit

RFC PATCH Superseded Igor Matheus Andrade Torrente 2 participants 5 messages May 31, 2021 – Jun 8, 2021 TTY layer and serial drivers

v1 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 tty: Fix out-of-bound vmalloc access in imageblit

This issue happens when a userspace program does an ioctl FBIOPUT_VSCREENINFO passing the fb_var_screeninfo struct containing only the fields xres, yres, and bits_per_pixel with values.

If this struct is the same as the previous ioctl, the vc_resize() detects it and doesn't call the resize_screen(), leaving the fb_var_screeninfo incomplete. And this leads to the updatescrollmode() calculates a wrong value to fbcon_display->vrows, which makes the real_y() return a wrong value of y, and that value, eventually, causes the imageblit to access an out-of-bound address value.

To solve this issue I brougth the resize_screen() the beginning of vc_do_resize(), so it will "fix and fill" the fb_var_screeninfo even if the screen does not need any resizing.

---
 drivers/tty/vt/vt.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +4 -8
index fa1548d4f94b..1b90758d8893 100644
@@ -1219,6 +1219,10 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 	new_row_size = new_cols << 1;
 	new_screen_size = new_row_size * new_rows;
 
+	err = resize_screen(vc, new_cols, new_rows, user);
+	if (err)
+		return err;
+
 	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
 		return 0;
 
@@ -1241,14 +1245,6 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 
 	old_rows = vc->vc_rows;
 	old_row_size = vc->vc_size_row;
-
-	err = resize_screen(vc, new_cols, new_rows, user);
-	if (err) {
-		kfree(newscreen);
-		vc_uniscr_free(new_uniscr);
-		return err;
-	}
-
 	vc->vc_rows = new_rows;
 	vc->vc_cols = new_cols;
 	vc->vc_size_row = new_row_size;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 18 lines · Igor Matheus Andrade Torrente

This issue happens when a userspace program does an ioctl FBIOPUT_VSCREENINFO passing the fb_var_screeninfo struct containing only the fields xres, yres, and bits_per_pixel with values.

If this struct is the same as the previous ioctl, the vc_resize() detects it and doesn't call the resize_screen(), leaving the fb_var_screeninfo incomplete. And this leads to the updatescrollmode() calculates a wrong value to fbcon_display->vrows, which makes the real_y() return a wrong value of y, and that value, eventually, causes the imageblit to access an out-of-bound address value.

To solve this issue I brougth the resize_screen() the beginning of vc_do_resize(), so it will "fix and fill" the fb_var_screeninfo even if the screen does not need any resizing.

Quoted 5 lines
---
 drivers/tty/vt/vt.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

Why is this "RFC"?

#2 lore raw

Hi Greg,

Quoted 19 lines · Greg KH
Quoted 18 lines · Igor Matheus Andrade Torrente

This issue happens when a userspace program does an ioctl FBIOPUT_VSCREENINFO passing the fb_var_screeninfo struct containing only the fields xres, yres, and bits_per_pixel with values.

If this struct is the same as the previous ioctl, the vc_resize() detects it and doesn't call the resize_screen(), leaving the fb_var_screeninfo incomplete. And this leads to the updatescrollmode() calculates a wrong value to fbcon_display->vrows, which makes the real_y() return a wrong value of y, and that value, eventually, causes the imageblit to access an out-of-bound address value.

To solve this issue I brougth the resize_screen() the beginning of vc_do_resize(), so it will "fix and fill" the fb_var_screeninfo even if the screen does not need any resizing.

Quoted 8 lines
Quoted 5 lines
---
  drivers/tty/vt/vt.c | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)

Why is this "RFC"?

Maybe I'm using it wrongly, but I usually use RFC to indicate that patch is probably not ready and needs comments/suggestions to improve it. In case, I don't have much experience with vt driver and I'm a little bit afraid to break something.

maintainer
#3 lore raw
In reply to Igor Matheus Andrade Torrente
Quoted 29 lines · Igor Matheus Andrade Torrente

This issue happens when a userspace program does an ioctl FBIOPUT_VSCREENINFO passing the fb_var_screeninfo struct containing only the fields xres, yres, and bits_per_pixel with values.

If this struct is the same as the previous ioctl, the vc_resize() detects it and doesn't call the resize_screen(), leaving the fb_var_screeninfo incomplete. And this leads to the updatescrollmode() calculates a wrong value to fbcon_display->vrows, which makes the real_y() return a wrong value of y, and that value, eventually, causes the imageblit to access an out-of-bound address value.

To solve this issue I brougth the resize_screen() the beginning of vc_do_resize(), so it will "fix and fill" the fb_var_screeninfo even if the screen does not need any resizing.

---
 drivers/tty/vt/vt.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +0 -0
index fa1548d4f94b..1b90758d8893 100644

drivers/tty/vt/vt.c static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, · line 1228

Quoted 10 lines
drivers/tty/vt/vt.c +4 -0
@@ -1219,6 +1219,10 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
 	new_row_size = new_cols << 1;
 	new_screen_size = new_row_size * new_rows;
 
+	err = resize_screen(vc, new_cols, new_rows, user);
+	if (err)
+		return err;
+
 	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
 		return 0;
 

But now if any of the checks below this call fail, the screen will be resized and not "put back" to the original size, right? That could cause a mis-match of what is expected here.

thanks,

greg k-h

#4 lore raw
Quoted 33 lines · Greg KH
Quoted 32 lines · Igor Matheus Andrade Torrente

This issue happens when a userspace program does an ioctl FBIOPUT_VSCREENINFO passing the fb_var_screeninfo struct containing only the fields xres, yres, and bits_per_pixel with values.

If this struct is the same as the previous ioctl, the vc_resize() detects it and doesn't call the resize_screen(), leaving the fb_var_screeninfo incomplete. And this leads to the updatescrollmode() calculates a wrong value to fbcon_display->vrows, which makes the real_y() return a wrong value of y, and that value, eventually, causes the imageblit to access an out-of-bound address value.

To solve this issue I brougth the resize_screen() the beginning of vc_do_resize(), so it will "fix and fill" the fb_var_screeninfo even if the screen does not need any resizing.

---
  drivers/tty/vt/vt.c | 12 ++++--------
  1 file changed, 4 insertions(+), 8 deletions(-)
drivers/tty/vt/vt.c +0 -0
index fa1548d4f94b..1b90758d8893 100644
@@ -1219,6 +1219,10 @@ static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc,
  	new_row_size = new_cols << 1;
  	new_screen_size = new_row_size * new_rows;
 
Quoted 11 lines

drivers/tty/vt/vt.c static int vc_do_resize(struct tty_struct *tty, struct vc_data *vc, · line 1228

Quoted 7 lines
drivers/tty/vt/vt.c +4 -0
+	err = resize_screen(vc, new_cols, new_rows, user);
+	if (err)
+		return err;
+
  	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
  		return 0;
 

But now if any of the checks below this call fail, the screen will be resized and not "put back" to the original size, right? That could cause a mis-match of what is expected here.

Right, this will probably cause problems. :/ Thanks to point out, I'll work to find another solution.

Quoted 5 lines

thanks,

greg k-h

---
Igor M. A. Torrente