linux-fbdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()"
@ 2023-07-28  9:19 Geert Uytterhoeven
  2023-07-28 10:02 ` Javier Martinez Canillas
  0 siblings, 1 reply; 2+ messages in thread
From: Geert Uytterhoeven @ 2023-07-28  9:19 UTC (permalink / raw)
  To: Tetsuo Handa, Daniel Vetter, Helge Deller
  Cc: Kees Cook, Alexander Potapenko, Marco Elver, Dmitry Vyukov,
	kasan-dev, linux-fbdev, dri-devel, linux-kernel,
	Geert Uytterhoeven

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(-)

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);
-- 
2.34.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()"
  2023-07-28  9:19 [PATCH v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" Geert Uytterhoeven
@ 2023-07-28 10:02 ` Javier Martinez Canillas
  0 siblings, 0 replies; 2+ messages in thread
From: Javier Martinez Canillas @ 2023-07-28 10:02 UTC (permalink / raw)
  To: Geert Uytterhoeven, Tetsuo Handa, Daniel Vetter, Helge Deller
  Cc: Marco Elver, Kees Cook, Geert Uytterhoeven, linux-fbdev,
	kasan-dev, linux-kernel, Alexander Potapenko, dri-devel,
	Dmitry Vyukov

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!

-- 
Best regards,

Javier Martinez Canillas
Core Platforms
Red Hat


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-07-28 10:03 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-28  9:19 [PATCH v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" Geert Uytterhoeven
2023-07-28 10:02 ` Javier Martinez Canillas

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).