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: 127485 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp316673vqg; Fri, 28 Jul 2023 02:51:15 -0700 (PDT) X-Google-Smtp-Source: APBJJlGECrGgvVq4tx2lsLDJz9CyY+wuiDxoe/WqyxEW/G9O1q/fgEkJxGWIzpqsezSY5EKqOKIc X-Received: by 2002:a05:620a:90a:b0:768:163c:23ed with SMTP id v10-20020a05620a090a00b00768163c23edmr1985172qkv.46.1690537875707; Fri, 28 Jul 2023 02:51:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690537875; cv=none; d=google.com; s=arc-20160816; b=t5bTKySKaIBX4TN/iW7QTdxUF+21LC+iZe5teMmgLH6gZofT6U6CwAGL66iYKCI0P9 19Oi1LYxOADhb+E7PCn47rBaJIhUs7w4hoFjjR6DCXR5VNijXmRXQklafzL5y0hw/nvb pKLROMqOCp8rQhV8RQBdtkQTVOKqmLmrtLODo2w2xUu2gol08np9F3DJSqLRHu2/cR6q Vx4mxsX2+in9ZpHjaCKLruPj4c2CfcfPmE1zntNQBdco1JutbW02LI32pUORK9JcnVvU DBL3w52sGqbalc/TPp9OIFp+FdV5WDyehoAABH74oY294lIUOe2vT/OFt+2jFLoPAqWd ZPpQ== 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=vj8xo2Q8HuQ0aIb6wvPrsig7eZ6sKhYUqfz+TQyYCYk=; fh=8QOdoXAkdgM3kVmr53MK5lC0RpM8fsLltxTwScERO7w=; b=l8P/TQUwD0zvwsdqQP/vTUTjtb+jl1yZI7PXaviZoSuEsGtwHJRtqGevKtcnOScg49 wfoZJU5Xprm+ZFHhT5JY7q3Q3C1MGZzaF9FJuW1QWrP+shWDb0kOG/Gi/QJOiJm5d8I+ njATRxhcIdXa7zteHWz6e1aP4tOlUM6+jBUNjKb49WM8oa3EBG5MtSx4BW2GG0KdGqo1 htACW1hrk9Ss4M3/wsyDde/5+z0CbwKtRx/JMSPteRUsLgJbwQtNvtHCF37gxrYnwEyP yM1pQKGTCE3dq1Saf+ObYmWXxndox32hWuF0pzo7iVuUwm2SR+oggFaFpfU0EYOhyQkZ W9uA== 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 pi10-20020a17090b1e4a00b00263c48abf8asi4642077pjb.31.2023.07.28.02.51.03; Fri, 28 Jul 2023 02:51:15 -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 S233490AbjG1JZu (ORCPT + 99 others); Fri, 28 Jul 2023 05:25:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235512AbjG1JZ0 (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 40F235FEE 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 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: 1772657443589460874 X-GMAIL-MSGID: 1772657443589460874 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);