Unverified Commit 5c380526 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Javier Martinez Canillas
Browse files

Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" 

This reverts commit a6a00d7e.

This commit is redundant, as the root cause that resulted in a false
positive was fixed by commit 27f644dc ("x86: kmsan: use C
versions of memset16/memset32/memset64").

Closes: https://lore.kernel.org/r/CAMuHMdUH4CU9EfoirSxjivg08FDimtstn7hizemzyQzYeq6b6g@mail.gmail.com/


Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Signed-off-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bd8b71bb13af21cc48af40349db440f794336d3a.1690535849.git.geert+renesas@glider.be
parent a8b0a7fd

drivers/video/fbdev/core/fbcon.c

+1 −1
Original line number Diff line number Diff line
@@ -577,7 +577,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, 
		if (scr_readw(r) != vc->vc_video_erase_char)

			break;

	if (r != q && new_rows >= rows + logo_lines) {

		save = kzalloc(array3_size(logo_lines, new_cols, 2),

		save = kmalloc(array3_size(logo_lines, new_cols, 2),

			       GFP_KERNEL);

		if (save) {

			int i = min(cols, new_cols);