diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2023-07-28 11:19:45 +0200 |
|---|---|---|
| committer | Javier Martinez Canillas <javierm@redhat.com> | 2023-07-28 11:47:03 +0200 |
| commit | 5c38052680f56b6ae766517c737af420f83ee5f5 (patch) | |
| tree | 8e87d5709b625117dc1ee47960a4d70ac012ce7e | |
| parent | a8b0a7fd535faecbd443c866e6b973a388f0bfab (diff) | |
| download | lwn-5c38052680f56b6ae766517c737af420f83ee5f5.tar.gz lwn-5c38052680f56b6ae766517c737af420f83ee5f5.zip | |
Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()"
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
| -rw-r--r-- | drivers/video/fbdev/core/fbcon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 8e76bc246b38..0246948f3c81 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); |