| Message ID | bd8b71bb13af21cc48af40349db440f794336d3a.1690535849.git.geert+renesas@glider.be (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" | expand |
Geert Uytterhoeven <geert+renesas@glider.be> writes: Hello Geert, > 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> Pushed to drm-misc (drm-misc-next). Thanks!
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 62733f118833c6ca..f394c817bc074e0e 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -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);
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> --- v2: - Update description, as requested by Handa-san. --- drivers/video/fbdev/core/fbcon.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)