fbcon: Use array3_size() helper in scr_memcpyw()
Subsystems (3)
PATCH 1/1 fbcon: Use array3_size() helper in scr_memcpyw()
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
--- drivers/video/fbdev/core/fbcon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/video/fbdev/core/fbcon.c +2 -2
@@ -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);
Signature · 1 line
2.27.0
Bartlomiej Zolnierkiewicz
AppliedQuoted 9 lines · Gustavo A. R. Silva
Use
array3_size()helper instead of the open-coded version inscr_memcpyw()andscr_memsetw(). These sorts of multiplication factors need to be wrapped inarray3_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 <[email protected]>
Applied to drm-misc-next tree, thanks.
Best regards,
--
Bartlomiej Zolnierkiewicz
Samsung R&D Institute Poland
Samsung Electronics
Quoted 27 lines
--- drivers/video/fbdev/core/fbcon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/video/fbdev/core/fbcon.c +2
-2@@ -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);