Skip to contentSkip to conversation

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

PATCH Superseded Igor Matheus Andrade Torrente 2 participants 2 messages Jun 14, 2021 – Jun 15, 2021 TTY layer and serial drivers

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 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 made the resize_screen() be called even if the screen does not need any resizing, so it will "fix and fill" the fb_var_screeninfo independently.

---
v2: It Tries to avoid the problem found by Greg in the previous
patch.

---
 drivers/tty/vt/vt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/vt/vt.c +4 -2
index fa1548d4f94b..e522f9b249e5 100644
@@ -1219,8 +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;
 
-	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
-		return 0;
+	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows) {
+		err = resize_screen(vc, new_cols, new_rows, user);
+		return err;
+	}
 
 	if (new_screen_size > KMALLOC_MAX_SIZE || !new_screen_size)
 		return -EINVAL;
Signature · 1 line
2.20.1
maintainer
#1 lore raw
Quoted 31 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 made the resize_screen() be called even if the screen does not need any resizing, so it will "fix and fill" the fb_var_screeninfo independently.

---
v2: It Tries to avoid the problem found by Greg in the previous
patch.

---
 drivers/tty/vt/vt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/tty/vt/vt.c +0 -0
index fa1548d4f94b..e522f9b249e5 100644

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

Quoted 8 lines
drivers/tty/vt/vt.c +3 -2
@@ -1219,8 +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;
 
-	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows)
-		return 0;
+	if (new_cols == vc->vc_cols && new_rows == vc->vc_rows) {
+		err = resize_screen(vc, new_cols, new_rows, user);
+		return err;

Shouldn't this just be a single line change to:

		return resize_screen(vc, new_cols, new_rows, user);

?

But this also should get a big comment, as it looks odd that if the size isn't changing, why this function should be called at all. At first glance at just the code, this looks wrong, so please document this really well here.

thanks,

greg k-h