From patchwork Mon Jul 24 17:03:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 125118 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp1954815vqg; Mon, 24 Jul 2023 10:46:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlEx8XP7kH/gQ60dq3QoQrvrr6BnrJiDHGP/3WMxqK+eq3JoMb+TcPUIY5qwpR7fBlea6Ivp X-Received: by 2002:a05:6512:2252:b0:4f8:6d54:72f9 with SMTP id i18-20020a056512225200b004f86d5472f9mr8387146lfu.61.1690220764518; Mon, 24 Jul 2023 10:46:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690220764; cv=none; d=google.com; s=arc-20160816; b=ucFdorGKntLdgjtm1xWk67pNkfgS+WsFT3DBUeEerJ8qMm8Y428N6Mhz3gf4K8buXc w0Q4YVuW355f6AE4PGFaGlDKiEOaze8C4H6a4QOlgAj2xc8QaYWi9mxoIg06zhQqHHbe W/1ow46JgonA5HWQcrFMXVyTVoJu/NgJy1TFgIKftwaJzeSKrnK5ZeU8lBojbBmN850C 7g0GeAT53tHwsYEbWZIvpUlw8KZO7sOXcb6jdtqNOBJca6BigL6hFGvzuAQ0DbQNSNZz DFTt/NzkOiZobEtxTgALj6LU4lrLQXGo1pdz36uVgJ1aPp3nmgvNUDEGVy6qvTkZuGjo fsqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=7nNlqh/M1sJij1FcLOZzUS65T2Uv+bbbr2phi4BKTQI=; fh=8QOdoXAkdgM3kVmr53MK5lC0RpM8fsLltxTwScERO7w=; b=FVZY4YW7e2zQcWCv0FpE44gF8s+2qMfEBoRQu1n+v3jM43ftkknSh2BV5iXFblsV8+ ytdhrxiRaRxLLhB7Z/RgzV73Af3Ib5vEA10ZK3Z/Rn8kitFIvVz6ypKNZF0t9kkXBF/O zkoRIbsvqhBYK+QAVJf+Y53qNjn0KCEUILsn4kGoMVbg4e9CL0NAQcIEcfFly9A7s6Um SEbi7EOABiCypY2Bdjcwci06wbM6/5DgsSXMvZS44GVbykHakIE48vS/HuDaD4D1lQUp 0ggNn8CLu59eDBOQGZgLG00Sax4A4U9ivWRDD2+s6pjUzAD3WcGh/Nk5JAFFlRMv3ryI sIGQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ss10-20020a170907038a00b00991cb7517bbsi6539311ejb.947.2023.07.24.10.45.39; Mon, 24 Jul 2023 10:46:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231588AbjGXREC (ORCPT + 99 others); Mon, 24 Jul 2023 13:04:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230154AbjGXREB (ORCPT ); Mon, 24 Jul 2023 13:04:01 -0400 Received: from xavier.telenet-ops.be (xavier.telenet-ops.be [IPv6:2a02:1800:120:4::f00:14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6EC210D3 for ; Mon, 24 Jul 2023 10:03:58 -0700 (PDT) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed40:2d50:2ea4:d4e1:2af3]) by xavier.telenet-ops.be with bizsmtp id R53t2A00F2TBYXr0153tLe; Mon, 24 Jul 2023 19:03:56 +0200 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtp (Exim 4.95) (envelope-from ) id 1qNyyD-002PJX-Ku; Mon, 24 Jul 2023 19:03:53 +0200 Received: from geert by rox.of.borg with local (Exim 4.95) (envelope-from ) id 1qNyyP-007DmR-NR; Mon, 24 Jul 2023 19:03:53 +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] Revert "fbcon: Use kzalloc() in fbcon_prepare_logo()" Date: Mon, 24 Jul 2023 19:03:48 +0200 Message-Id: <98b79fbdde69a4a203096eb9c8801045c5a055fb.1690218016.git.geert+renesas@glider.be> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772324928160222906 X-GMAIL-MSGID: 1772324928160222906 This reverts commit a6a00d7e8ffd78d1cdb7a43f1278f081038c638f. The syzbot report turned out to be a false possitive, caused by a KMSAN problem. Indeed, after allocating the buffer, it is fully initialized using scr_memsetw(). Hence there is no point in allocating zeroed memory, while this does incur some overhead. Closes: https://lore.kernel.org/r/CAMuHMdUH4CU9EfoirSxjivg08FDimtstn7hizemzyQzYeq6b6g@mail.gmail.com/ Signed-off-by: Geert Uytterhoeven --- 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 8e76bc246b3871b0..0246948f3c81a7a6 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);