From: Helge Deller <deller@gmx.de>
To: daniel.vetter@ffwll.ch, linux-fbdev@vger.kernel.org,
geert@linux-m68k.org, dri-devel@lists.freedesktop.org
Subject: [PATCH v2 3/4] fbmem: Prevent invalid virtual screen sizes in fb_set_var()
Date: Fri, 1 Jul 2022 22:22:05 +0200 [thread overview]
Message-ID: <20220701202206.559518-4-deller@gmx.de> (raw)
In-Reply-To: <20220701202206.559518-1-deller@gmx.de>
Prevent that drivers configure a virtual screen resolution smaller than
the physical screen resolution. This is important, because otherwise we
may access memory outside of the graphics memory area.
Give a kernel WARNing and show the driver name to help locating the buggy
driver.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: stable@vger.kernel.org # v5.4+
---
drivers/video/fbdev/core/fbmem.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c
index 160389365a36..e8f06d26803c 100644
--- a/drivers/video/fbdev/core/fbmem.c
+++ b/drivers/video/fbdev/core/fbmem.c
@@ -1016,6 +1016,18 @@ fb_set_var(struct fb_info *info, struct fb_var_screeninfo *var)
if (ret)
return ret;
+ /* make sure virtual resolution >= physical resolution */
+ if (WARN_ON(var->xres_virtual < var->xres)) {
+ pr_warn("fbcon: Fix up invalid xres %d for %s\n",
+ var->xres_virtual, info->fix.id);
+ var->xres_virtual = var->xres;
+ }
+ if (WARN_ON(var->yres_virtual < var->yres)) {
+ pr_warn("fbcon: Fix up invalid yres %d for %s\n",
+ var->yres_virtual, info->fix.id);
+ var->yres_virtual = var->yres;
+ }
+
if ((var->activate & FB_ACTIVATE_MASK) != FB_ACTIVATE_NOW)
return 0;
--
2.35.3
next prev parent reply other threads:[~2022-07-01 20:22 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-01 20:22 [PATCH v2 0/4] fbcon: Fixes for screen resolution changes - round 2 Helge Deller
2022-07-01 20:22 ` [PATCH v2 1/4] fbcon: Disallow setting font bigger than screen size Helge Deller
2022-07-01 20:22 ` [PATCH v2 2/4] fbcon: Prevent that screen size is smaller than font size Helge Deller
2022-07-01 20:22 ` Helge Deller [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-07-01 20:23 [PATCH v2 0/4] fbcon: Fixes for screen resolution changes - round 2 Helge Deller
2022-07-01 20:23 ` [PATCH v2 3/4] fbmem: Prevent invalid virtual screen sizes in fb_set_var() Helge Deller
2022-07-03 8:55 ` Geert Uytterhoeven
2022-07-03 13:53 ` Helge Deller
2022-07-03 14:41 ` Geert Uytterhoeven
2022-07-04 8:38 ` Helge Deller
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=20220701202206.559518-4-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).