From: Daniel Vetter <daniel@ffwll.ch>
To: Helge Deller <deller@gmx.de>
Cc: dri-devel@lists.freedesktop.org, daniel.vetter@ffwll.ch,
linux-fbdev@vger.kernel.org
Subject: Re: [PATCH v3 3/4] fbmem: Check screen resolution change against font size
Date: Sun, 26 Jun 2022 00:33:53 +0200 [thread overview]
Message-ID: <YreNUfv8d9QeJT8C@phenom.ffwll.local> (raw)
In-Reply-To: <20220625220630.333705-4-deller@gmx.de>
On Sun, Jun 26, 2022 at 12:06:29AM +0200, Helge Deller wrote:
> 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+
Please squash with previous patch. You might also want to add a note there
that on older kernels backporters need to open-code
fbcon_info_from_console instead, since it only exists since
409d6c95f9c6 ("fbcon: Introduce wrapper for console->fb_info lookup")
With these two nits: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
> 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
>
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
next prev parent reply other threads:[~2022-06-25 22:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-25 22:06 [PATCH v3 0/4] fbcon: Fixes for screen resolution changes Helge Deller
2022-06-25 22:06 ` [PATCH v3 1/4] fbcon: Disallow setting font bigger than screen size Helge Deller
2022-06-25 22:06 ` [PATCH v3 2/4] fbcon: Add fbcon_modechange_possible() check Helge Deller
2022-06-25 22:06 ` [PATCH v3 3/4] fbmem: Check screen resolution change against font size Helge Deller
2022-06-25 22:33 ` Daniel Vetter [this message]
2022-06-25 22:37 ` Daniel Vetter
2022-06-25 23:12 ` Helge Deller
2022-06-25 23:56 ` Helge Deller
2022-06-26 8:49 ` Daniel Vetter
2022-06-26 9:00 ` Helge Deller
2022-06-25 22:57 ` Helge Deller
2022-06-25 22:06 ` [PATCH v3 4/4] fbmem: Prevent invalid virtual screen sizes Helge Deller
2022-06-25 22:34 ` Daniel Vetter
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=YreNUfv8d9QeJT8C@phenom.ffwll.local \
--to=daniel@ffwll.ch \
--cc=daniel.vetter@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.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