From: Helge Deller <deller@gmx.de>
To: Shigeru Yoshida <syoshida@redhat.com>
Cc: linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org,
syzbot+a168dbeaaa7778273c1b@syzkaller.appspotmail.com
Subject: Re: [PATCH] fbcon: Properly revert changes when vc_resize() failed
Date: Wed, 24 Aug 2022 22:04:38 +0200 [thread overview]
Message-ID: <6efc0d2a-c2af-947c-d928-104e3add1650@gmx.de> (raw)
In-Reply-To: <20220818181336.3504010-1-syoshida@redhat.com>
Hi Shigeru,
On 8/18/22 20:13, Shigeru Yoshida wrote:
> fbcon_do_set_font() calls vc_resize() when font size is changed.
> However, if if vc_resize() failed, current implementation doesn't
> revert changes for font size, and this causes inconsistent state.
>
> syzbot reported unable to handle page fault due to this issue [1].
> syzbot's repro uses fault injection which cause failure for memory
> allocation, so vc_resize() failed.
>
> This patch fixes this issue by properly revert changes for font
> related date when vc_resize() failed.
>
> Link: https://syzkaller.appspot.com/bug?id=3443d3a1fa6d964dd7310a0cb1696d165a3e07c4 [1]
> Reported-by: syzbot+a168dbeaaa7778273c1b@syzkaller.appspotmail.com
> Signed-off-by: Shigeru Yoshida <syoshida@redhat.com>
applied.
Thank you!
Helge
> ---
> drivers/video/fbdev/core/fbcon.c | 27 +++++++++++++++++++++++++--
> 1 file changed, 25 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c
> index cf9ac4da0a82..825b012debe7 100644
> --- a/drivers/video/fbdev/core/fbcon.c
> +++ b/drivers/video/fbdev/core/fbcon.c
> @@ -2401,15 +2401,21 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount,
> struct fb_info *info = fbcon_info_from_console(vc->vc_num);
> struct fbcon_ops *ops = info->fbcon_par;
> struct fbcon_display *p = &fb_display[vc->vc_num];
> - int resize;
> + int resize, ret, old_userfont, old_width, old_height, old_charcount;
> char *old_data = NULL;
>
> resize = (w != vc->vc_font.width) || (h != vc->vc_font.height);
> if (p->userfont)
> old_data = vc->vc_font.data;
> vc->vc_font.data = (void *)(p->fontdata = data);
> + old_userfont = p->userfont;
> if ((p->userfont = userfont))
> REFCOUNT(data)++;
> +
> + old_width = vc->vc_font.width;
> + old_height = vc->vc_font.height;
> + old_charcount = vc->vc_font.charcount;
> +
> vc->vc_font.width = w;
> vc->vc_font.height = h;
> vc->vc_font.charcount = charcount;
> @@ -2425,7 +2431,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount,
> rows = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
> cols /= w;
> rows /= h;
> - vc_resize(vc, cols, rows);
> + ret = vc_resize(vc, cols, rows);
> + if (ret)
> + goto err_out;
> } else if (con_is_visible(vc)
> && vc->vc_mode == KD_TEXT) {
> fbcon_clear_margins(vc, 0);
> @@ -2435,6 +2443,21 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount,
> if (old_data && (--REFCOUNT(old_data) == 0))
> kfree(old_data - FONT_EXTRA_WORDS * sizeof(int));
> return 0;
> +
> +err_out:
> + p->fontdata = old_data;
> + vc->vc_font.data = (void *)old_data;
> +
> + if (userfont) {
> + p->userfont = old_userfont;
> + REFCOUNT(data)--;
> + }
> +
> + vc->vc_font.width = old_width;
> + vc->vc_font.height = old_height;
> + vc->vc_font.charcount = old_charcount;
> +
> + return ret;
> }
>
> /*
prev parent reply other threads:[~2022-08-24 20:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-18 18:13 Shigeru Yoshida
2022-08-24 20:04 ` Helge Deller [this message]
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=6efc0d2a-c2af-947c-d928-104e3add1650@gmx.de \
--to=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=syoshida@redhat.com \
--cc=syzbot+a168dbeaaa7778273c1b@syzkaller.appspotmail.com \
/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
all inboxes | Powered by JetHome®