All of lore.kernel.org
 help / color / mirror / Atom feed
From: Helge Deller <deller@gmx.de>
To: daniel.vetter@ffwll.ch, linux-fbdev@vger.kernel.org,
	dri-devel@lists.freedesktop.org, geert@linux-m68k.org
Subject: [PATCH 2/5] fbcon: Fix up user-provided virtual screen size
Date: Wed, 29 Jun 2022 22:00:21 +0200	[thread overview]
Message-ID: <20220629200024.187187-3-deller@gmx.de> (raw)
In-Reply-To: <20220629200024.187187-1-deller@gmx.de>

The virtual screen size can't be smaller than the physical screen size.
Based on the general rule that we round up user-provided input if
neccessary, adjust the virtual screen size as well if needed.

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

diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index afa2863670f3..e645b96d2700 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1106,6 +1106,11 @@ static long do_fb_ioctl(struct fb_info *info, unsigned int cmd,
 			return -EFAULT;
 		console_lock();
 		lock_fb_info(info);
+		/* adjust virtual screen size if user missed it */
+		if (var.xres_virtual < var.xres)
+			var.xres_virtual = var.xres;
+		if (var.yres_virtual < var.yres)
+			var.yres_virtual = var.yres;
 		ret = fb_set_var(info, &var);
 		if (!ret)
 			fbcon_update_vcs(info, var.activate & FB_ACTIVATE_ALL);
--
2.35.3


  parent reply	other threads:[~2022-06-29 20:00 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-29 20:00 [PATCH 0/5] fbcon: Fixes for screen resolution changes - round 2 Helge Deller
2022-06-29 20:00 ` [PATCH 1/5] fbcon: Disallow setting font bigger than screen size Helge Deller
2022-06-30 18:51   ` Geert Uytterhoeven
2022-06-30 19:26     ` Helge Deller
2022-06-29 20:00 ` Helge Deller [this message]
2022-06-30 19:00   ` [PATCH 2/5] fbcon: Fix up user-provided virtual " Geert Uytterhoeven
2022-06-30 19:30     ` Helge Deller
2022-06-30 19:36       ` Geert Uytterhoeven
2022-06-30 19:46         ` Helge Deller
2022-06-30 20:00           ` Geert Uytterhoeven
2022-06-30 20:10             ` Helge Deller
2022-07-01  7:28               ` Geert Uytterhoeven
2022-07-01  9:30                 ` Helge Deller
2022-07-01 14:52                   ` Geert Uytterhoeven
2022-07-01 20:13                     ` Helge Deller
2022-06-29 20:00 ` [PATCH 3/5] fbcon: Prevent that screen size is smaller than font size Helge Deller
2022-06-30 19:09   ` Geert Uytterhoeven
2022-06-30 19:18     ` Geert Uytterhoeven
2022-06-30 19:40     ` Helge Deller
2022-06-29 20:00 ` [PATCH 4/5] fbmem: Prevent invalid virtual screen sizes in fb_set_var() Helge Deller
2022-06-30 19:11   ` Geert Uytterhoeven
2022-06-30 19:16     ` Helge Deller
2022-06-30 19:38       ` Geert Uytterhoeven
2022-07-01 14:49         ` Geert Uytterhoeven
2022-07-02 12:05           ` Michel Dänzer
2022-07-02 16:26             ` Helge Deller
2022-06-29 20:00 ` [PATCH 5/5] fbcon: Use fbcon_info_from_console() in fbcon_modechange_possible() Helge Deller
2022-06-30 19:21   ` Geert Uytterhoeven

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220629200024.187187-3-deller@gmx.de \
    --to=deller@gmx.de \
    --cc=daniel.vetter@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=geert@linux-m68k.org \
    --cc=linux-fbdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.