From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: Jiri Slaby <jirislaby@kernel.org>
Cc: gregkh@linuxfoundation.org, Daniel Vetter <daniel@ffwll.ch>,
Helge Deller <deller@gmx.de>,
linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
Sanan Hasanov <sanan.hasanov@Knights.ucf.edu>
Subject: Re: [PATCH] fbcon: Check font dimension limits
Date: Sun, 29 Jan 2023 16:04:33 +0100 [thread overview]
Message-ID: <20230129150433.gmdmger2ah63nsg7@begin> (raw)
In-Reply-To: <3bcd9911-5fdd-2a1a-0a76-55e1b8f7642a@kernel.org>
Jiri Slaby, le jeu. 26 janv. 2023 10:02:55 +0100, a ecrit:
> On 26. 01. 23, 1:49, Samuel Thibault wrote:
> > Index: linux-6.0/drivers/video/fbdev/core/fbcon.c
> > ===================================================================
> > --- linux-6.0.orig/drivers/video/fbdev/core/fbcon.c
> > +++ linux-6.0/drivers/video/fbdev/core/fbcon.c
> > @@ -2489,9 +2489,12 @@ static int fbcon_set_font(struct vc_data
> > h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres))
> > return -EINVAL;
> > + if (font->width > 32 || font->height > 32)
> > + return -EINVAL;
> > +
> > /* Make sure drawing engine can handle the font */
> > - if (!(info->pixmap.blit_x & (1 << (font->width - 1))) ||
> > - !(info->pixmap.blit_y & (1 << (font->height - 1))))
> > + if (!(info->pixmap.blit_x & (1U << (font->width - 1))) ||
> > + !(info->pixmap.blit_y & (1U << (font->height - 1))))
>
> So use BIT() properly then? That should be used in all these shifts anyway.
> Exactly to avoid UB.
Right, I'll use that in next version.
Samuel
WARNING: multiple messages have this Message-ID (diff)
From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: Jiri Slaby <jirislaby@kernel.org>
Cc: linux-fbdev@vger.kernel.org,
Sanan Hasanov <sanan.hasanov@Knights.ucf.edu>,
gregkh@linuxfoundation.org, Helge Deller <deller@gmx.de>,
linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
stable@vger.kernel.org
Subject: Re: [PATCH] fbcon: Check font dimension limits
Date: Sun, 29 Jan 2023 16:04:33 +0100 [thread overview]
Message-ID: <20230129150433.gmdmger2ah63nsg7@begin> (raw)
In-Reply-To: <3bcd9911-5fdd-2a1a-0a76-55e1b8f7642a@kernel.org>
Jiri Slaby, le jeu. 26 janv. 2023 10:02:55 +0100, a ecrit:
> On 26. 01. 23, 1:49, Samuel Thibault wrote:
> > Index: linux-6.0/drivers/video/fbdev/core/fbcon.c
> > ===================================================================
> > --- linux-6.0.orig/drivers/video/fbdev/core/fbcon.c
> > +++ linux-6.0/drivers/video/fbdev/core/fbcon.c
> > @@ -2489,9 +2489,12 @@ static int fbcon_set_font(struct vc_data
> > h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres))
> > return -EINVAL;
> > + if (font->width > 32 || font->height > 32)
> > + return -EINVAL;
> > +
> > /* Make sure drawing engine can handle the font */
> > - if (!(info->pixmap.blit_x & (1 << (font->width - 1))) ||
> > - !(info->pixmap.blit_y & (1 << (font->height - 1))))
> > + if (!(info->pixmap.blit_x & (1U << (font->width - 1))) ||
> > + !(info->pixmap.blit_y & (1U << (font->height - 1))))
>
> So use BIT() properly then? That should be used in all these shifts anyway.
> Exactly to avoid UB.
Right, I'll use that in next version.
Samuel
next prev parent reply other threads:[~2023-01-29 15:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20230126004911.869923511@ens-lyon.org>
2023-01-26 0:49 ` [PATCH] fbcon: Check font dimension limits Samuel Thibault
2023-01-26 0:49 ` Samuel Thibault
2023-01-26 0:51 ` Samuel Thibault
2023-01-26 0:51 ` Samuel Thibault
2023-01-26 7:43 ` Greg KH
2023-01-26 7:43 ` Greg KH
2023-01-26 9:08 ` Jiri Slaby
2023-01-26 9:08 ` Jiri Slaby
2023-01-29 15:13 ` Samuel Thibault
2023-01-29 15:13 ` Samuel Thibault
2023-01-26 9:02 ` Jiri Slaby
2023-01-26 9:02 ` Jiri Slaby
2023-01-29 15:04 ` Samuel Thibault [this message]
2023-01-29 15:04 ` Samuel Thibault
2023-01-28 1:32 ` kernel test robot
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=20230129150433.gmdmger2ah63nsg7@begin \
--to=samuel.thibault@ens-lyon.org \
--cc=daniel@ffwll.ch \
--cc=deller@gmx.de \
--cc=dri-devel@lists.freedesktop.org \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sanan.hasanov@Knights.ucf.edu \
--cc=stable@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.