From patchwork Fri Jul 28 09:19:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 707738 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8BD69C0015E for ; Fri, 28 Jul 2023 09:25:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235524AbjG1JZt (ORCPT ); Fri, 28 Jul 2023 05:25:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235520AbjG1JZ0 (ORCPT ); Fri, 28 Jul 2023 05:25:26 -0400 Received: from baptiste.telenet-ops.be (baptiste.telenet-ops.be [IPv6:2a02:1800:120:4::f00:13]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 425505FF5 for ; Fri, 28 Jul 2023 02:19:51 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:12b0:7b7e:d1ff:7873]) by baptiste.telenet-ops.be with bizsmtp id SZKn2A0040d1nm801ZKnTg; Fri, 28 Jul 2023 11:19:49 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qPJdF-002ltR-W6; Fri, 28 Jul 2023 11:19:47 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qPJdT-00AoEo-3k; Fri, 28 Jul 2023 11:19:47 +0200 From: Geert Uytterhoeven To: Tetsuo Handa , Daniel Vetter , Helge Deller Cc: Kees Cook , Alexander Potapenko , Marco Elver , Dmitry Vyukov , kasan-dev , linux-fbdev@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" Date: Fri, 28 Jul 2023 11:19:45 +0200 Message-Id: X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org 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 Reviewed-by: Javier Martinez Canillas --- 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);