[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-fbdev
Subject:    [PATCH v3 3/4] fbmem: Check screen resolution change against font size
From:       Helge Deller <deller () gmx ! de>
Date:       2022-06-25 22:06:29
Message-ID: 20220625220630.333705-4-deller () gmx ! de
[Download RAW message or body]

Enhance the check in the FBIOPUT_VSCREENINFO ioctl handler to verify if the
user-provided new screen size is bigger than the current font size.

Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v5.4+
---
 drivers/video/fbdev/core/fbmem.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index afa2863670f3..160389365a36 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1106,7 +1106,9 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
 			return -EFAULT;
 		console_lock();
 		lock_fb_info(info);
-		ret = fb_set_var(info, &var);
+		ret = fbcon_modechange_possible(info, &var);
+		if (!ret)
+			ret = fb_set_var(info, &var);
 		if (!ret)
 			fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL);
 		unlock_fb_info(info);
--
2.35.3

[prev in list] [next in list] [prev in thread] [next in thread]