* [PATCH][next] fbcon: Use array3_size() helper in scr_memcpyw() @ 2020-06-15 23:15 ` Gustavo A. R. Silva 2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz 0 siblings, 1 reply; 2+ messages in thread From: Gustavo A. R. Silva @ 2020-06-15 23:15 UTC (permalink / raw) To: Bartlomiej Zolnierkiewicz Cc: linux-fbdev, linux-kernel, dri-devel, Gustavo A. R. Silva Use array3_size() helper instead of the open-coded version in scr_memcpyw() and scr_memsetw(). These sorts of multiplication factors need to be wrapped in array3_size(). This issue was found with the help of Coccinelle and, audited and fixed manually. Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83 Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- drivers/video/fbdev/core/fbcon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 9d28a8e3328f..6af2734f2a7b 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -639,7 +639,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, GFP_KERNEL); if (save) { int i = cols < new_cols ? cols : new_cols; - scr_memsetw(save, erase, logo_lines * new_cols * 2); + scr_memsetw(save, erase, array3_size(logo_lines, new_cols, 2)); r = q - step; for (cnt = 0; cnt < logo_lines; cnt++, r += i) scr_memcpyw(save + cnt * new_cols, r, 2 * i); @@ -676,7 +676,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, q = (unsigned short *) (vc->vc_origin + vc->vc_size_row * rows); - scr_memcpyw(q, save, logo_lines * new_cols * 2); + scr_memcpyw(q, save, array3_size(logo_lines, new_cols, 2)); vc->vc_y += logo_lines; vc->vc_pos += logo_lines * vc->vc_size_row; kfree(save); -- 2.27.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH][next] fbcon: Use array3_size() helper in scr_memcpyw() 2020-06-15 23:15 ` [PATCH][next] fbcon: Use array3_size() helper in scr_memcpyw() Gustavo A. R. Silva @ 2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz 0 siblings, 0 replies; 2+ messages in thread From: Bartlomiej Zolnierkiewicz @ 2020-07-10 14:23 UTC (permalink / raw) To: Gustavo A. R. Silva Cc: linux-fbdev, linux-kernel, dri-devel, Gustavo A. R. Silva On 6/16/20 1:15 AM, Gustavo A. R. Silva wrote: > Use array3_size() helper instead of the open-coded version in scr_memcpyw() > and scr_memsetw(). These sorts of multiplication factors need to be wrapped > in array3_size(). > > This issue was found with the help of Coccinelle and, audited and fixed > manually. > > Addresses-KSPP-ID: https://github.com/KSPP/linux/issues/83 > Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> Applied to drm-misc-next tree, thanks. Best regards, -- Bartlomiej Zolnierkiewicz Samsung R&D Institute Poland Samsung Electronics > --- > drivers/video/fbdev/core/fbcon.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c > index 9d28a8e3328f..6af2734f2a7b 100644 > --- a/drivers/video/fbdev/core/fbcon.c > +++ b/drivers/video/fbdev/core/fbcon.c > @@ -639,7 +639,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, > GFP_KERNEL); > if (save) { > int i = cols < new_cols ? cols : new_cols; > - scr_memsetw(save, erase, logo_lines * new_cols * 2); > + scr_memsetw(save, erase, array3_size(logo_lines, new_cols, 2)); > r = q - step; > for (cnt = 0; cnt < logo_lines; cnt++, r += i) > scr_memcpyw(save + cnt * new_cols, r, 2 * i); > @@ -676,7 +676,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, > q = (unsigned short *) (vc->vc_origin + > vc->vc_size_row * > rows); > - scr_memcpyw(q, save, logo_lines * new_cols * 2); > + scr_memcpyw(q, save, array3_size(logo_lines, new_cols, 2)); > vc->vc_y += logo_lines; > vc->vc_pos += logo_lines * vc->vc_size_row; > kfree(save); > ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-07-10 14:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <CGME20200615231029eucas1p1875c2cab0363a12afd0c5dea7ab0cb8b@eucas1p1.samsung.com>
2020-06-15 23:15 ` [PATCH][next] fbcon: Use array3_size() helper in scr_memcpyw() Gustavo A. R. Silva
2020-07-10 14:23 ` Bartlomiej Zolnierkiewicz
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).