From patchwork Thu May 2 20:29:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1930866 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VVltN4rp0z23hd for ; Fri, 3 May 2024 06:30:19 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1s2d44-0003rf-C5; Thu, 02 May 2024 20:30:00 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1s2d40-0003rJ-K6 for kernel-team@lists.ubuntu.com; Thu, 02 May 2024 20:29:56 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 3A4923F281 for ; Thu, 2 May 2024 20:29:55 +0000 (UTC) Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-36c1af8f2f3so86853515ab.3 for ; Thu, 02 May 2024 13:29:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714681793; x=1715286593; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=IV5XjrejDtrjH/xPi7XffID2VmtKh9ImVI5vunhsv2k=; b=m0PlrQH5XXokitc8g/kFDHRxEfo2njbF6pqKezbEJgdtAuLcrTN0Pa3GX0spfsrA2D B3UZiFRYWEqeZx4f3+PauAaJrsGLjJit3W2dP5ItCjzgVH7bLV0qUn0KpNSanBesuFCd OH1cEHS8MuHd0F5VuRsXe/TiOfa5+RUZc6XfKn4jED8A8Xr+yCjLCM1NvncpZ23SZAzC rE7J2mzdMX7EuvydH9odlVRq29Nkw48TWcVYI7ZYbJ5B5545g9xE+NNzLmxeo/1XfGgD y3U+sjcxyYifrOq5ZKMRHpxTpgVh6LvAJgcAET079l5Oh5f8il/+uYYmJBMDR0H7UB5Y wVIA== X-Gm-Message-State: AOJu0YwyEuJMG/iPSyJnJ/K/ix97uX61fpoKZpW87mZGf/aTmJIZIBVR LuQInXVOfUHuoxuCnulNcPSQDknF/eprVYG4HvnHtrezySwzltEI+X1BtiI5smUDSKJIu/WHp8B 1XK0/oZqOjzk/kh9lTyYlIMHLb3Xrl+ygGjoAUOGELl5dsNX/6VMlMKHuXQRq+jrU+rEinJP2uH AGKeYGtertOQ== X-Received: by 2002:a05:6e02:b4b:b0:36c:297d:2c96 with SMTP id f11-20020a056e020b4b00b0036c297d2c96mr933500ilu.19.1714681793333; Thu, 02 May 2024 13:29:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHs8O9YrQr0/svU32gLXw9uL8+I27DzclKjiVrfi0DY7ekwtX/GwGjy5jto/jwPFEubcf6ocA== X-Received: by 2002:a05:6e02:b4b:b0:36c:297d:2c96 with SMTP id f11-20020a056e020b4b00b0036c297d2c96mr933488ilu.19.1714681793048; Thu, 02 May 2024 13:29:53 -0700 (PDT) Received: from smtp.gmail.com (104-218-69-129.dynamic.lnk.ne.allofiber.net. [104.218.69.129]) by smtp.gmail.com with ESMTPSA id i3-20020a056e02152300b0036c5b517adfsm353327ilu.36.2024.05.02.13.29.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 May 2024 13:29:52 -0700 (PDT) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][M][PATCH 1/1] fbcon: always restore the old font data in fbcon_do_set_font() Date: Thu, 2 May 2024 15:29:51 -0500 Message-Id: <20240502202951.21075-2-bethany.jamison@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240502202951.21075-1-bethany.jamison@canonical.com> References: <20240502202951.21075-1-bethany.jamison@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: "Jiri Slaby (SUSE)" [ Upstream commit 00d6a284fcf3fad1b7e1b5bc3cd87cbfb60ce03f ] Commit a5a923038d70 (fbdev: fbcon: Properly revert changes when vc_resize() failed) started restoring old font data upon failure (of vc_resize()). But it performs so only for user fonts. It means that the "system"/internal fonts are not restored at all. So in result, the very first call to fbcon_do_set_font() performs no restore at all upon failing vc_resize(). This can be reproduced by Syzkaller to crash the system on the next invocation of font_get(). It's rather hard to hit the allocation failure in vc_resize() on the first font_set(), but not impossible. Esp. if fault injection is used to aid the execution/failure. It was demonstrated by Sirius: BUG: unable to handle page fault for address: fffffffffffffff8 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD cb7b067 P4D cb7b067 PUD cb7d067 PMD 0 Oops: 0000 [#1] PREEMPT SMP KASAN CPU: 1 PID: 8007 Comm: poc Not tainted 6.7.0-g9d1694dc91ce #20 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.15.0-1 04/01/2014 RIP: 0010:fbcon_get_font+0x229/0x800 drivers/video/fbdev/core/fbcon.c:2286 Call Trace: con_font_get drivers/tty/vt/vt.c:4558 [inline] con_font_op+0x1fc/0xf20 drivers/tty/vt/vt.c:4673 vt_k_ioctl drivers/tty/vt/vt_ioctl.c:474 [inline] vt_ioctl+0x632/0x2ec0 drivers/tty/vt/vt_ioctl.c:752 tty_ioctl+0x6f8/0x1570 drivers/tty/tty_io.c:2803 vfs_ioctl fs/ioctl.c:51 [inline] ... So restore the font data in any case, not only for user fonts. Note the later 'if' is now protected by 'old_userfont' and not 'old_data' as the latter is always set now. (And it is supposed to be non-NULL. Otherwise we would see the bug above again.) Signed-off-by: Jiri Slaby (SUSE) Fixes: a5a923038d70 ("fbdev: fbcon: Properly revert changes when vc_resize() failed") Reported-and-tested-by: Ubisectech Sirius Cc: Ubisectech Sirius Cc: Daniel Vetter Cc: Helge Deller Cc: linux-fbdev@vger.kernel.org Cc: dri-devel@lists.freedesktop.org Signed-off-by: Daniel Vetter Link: https://patchwork.freedesktop.org/patch/msgid/20240208114411.14604-1-jirislaby@kernel.org Signed-off-by: Sasha Levin (cherry picked from commit 73a6bd68a1342f3a44cac9dffad81ad6a003e520 linux-6.6.y) CVE-2024-26798 Signed-off-by: Bethany Jamison --- drivers/video/fbdev/core/fbcon.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 887fad44e7ec3..36da10c2d2a4e 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2397,11 +2397,9 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, struct fbcon_ops *ops = info->fbcon_par; struct fbcon_display *p = &fb_display[vc->vc_num]; int resize, ret, old_userfont, old_width, old_height, old_charcount; - char *old_data = NULL; + u8 *old_data = vc->vc_font.data; resize = (w != vc->vc_font.width) || (h != vc->vc_font.height); - if (p->userfont) - old_data = vc->vc_font.data; vc->vc_font.data = (void *)(p->fontdata = data); old_userfont = p->userfont; if ((p->userfont = userfont)) @@ -2435,13 +2433,13 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, update_screen(vc); } - if (old_data && (--REFCOUNT(old_data) == 0)) + if (old_userfont && (--REFCOUNT(old_data) == 0)) kfree(old_data - FONT_EXTRA_WORDS * sizeof(int)); return 0; err_out: p->fontdata = old_data; - vc->vc_font.data = (void *)old_data; + vc->vc_font.data = old_data; if (userfont) { p->userfont = old_userfont;