]> git.dujemihanovic.xyz Git - linux.git/commitdiff
Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()"
authorGeert Uytterhoeven <geert+renesas@glider.be>
Fri, 28 Jul 2023 09:19:45 +0000 (11:19 +0200)
committerJavier Martinez Canillas <javierm@redhat.com>
Fri, 28 Jul 2023 09:47:03 +0000 (11:47 +0200)
This reverts commit a6a00d7e8ffd78d1cdb7a43f1278f081038c638f.

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

Closes: https://lore.kernel.org/r/CAMuHMdUH4CU9EfoirSxjivg08FDimtstn7hizemzyQzYeq6b6g@mail.gmail.com/
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/bd8b71bb13af21cc48af40349db440f794336d3a.1690535849.git.geert+renesas@glider.be
drivers/video/fbdev/core/fbcon.c

index 8e76bc246b3871b016063003f078f3c4459a02a8..0246948f3c81a7a61e865f4ea12a9f77e57525ef 100644 (file)
@@ -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);