From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794423415; b=YwYB7e3mOZWWgkWeJ0HXgtuOs4rgXik8vyvZBWWM1DtOsRl1yyTdQRAfIBPTrZpN3+zm 7z5ZBupY/gAVSJMMtWQEN3WwXqdePBCdpLu81iS0/AYV+CfPgLF+3RdMQCFwqE+lDg4Sn 1UQ8axy/0BW8ncwNBHzjJ1zv1ZvFmNmX6vOCTq65OpEUz2LoJRej+oXGnBqoVsxuCBAxR 2Muw8qpPqYa8uuh/IIwdwGmQtSWxXWsbYiBpVxhg0oTCPZ20MrNcbSz/l+d5oc1BiGLTR 5+qlBFFHkjd+phJyuzOVPDFYPestpWKz49K5U5mtnds6gMct7LFp/s0WWfw0DMB8Qtg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794423415; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=zlc5jVnqARGYoDntu9KNBE/wWPTEyA2DVFPAF7sw2Jo=; b=Bes1tu0nLkKIZcDZEz4NPXMT6Y7iMNeCee/40jfAhp1Oh89rm1FumEHHfYsJFx2xrzuc 4S4tr0x9jPh3V/HDb47PsC67L+F3Oouli5ES78efZAlYUtKXB6sNjWM5vMtiiLj9jJaSj qkmcYuAuhe79SVnb1QdxkmurCp6seBnOodsjZPe/hFPxw0N2pY0PXH1SbII5+FldDlG/S QSJOsjqCk8KOAmBDlHBuorwXQDJsmrne98j3/4WmjHfg/Qcv3BmaYsfNJcRp9h+CCxXnX VfyR1k8y4sgVpEKiquxRxrhaVIXVBfNdS6E8sSLtRTeHIXcNZ3DooC7yVbhOu8mPCng== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=KgnYajZ8; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 84F08606A31C for ; Wed, 11 Nov 2026 18:56:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=KgnYajZ8 Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBC9D1F00A05; Wed, 11 Nov 2026 18:56:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794423415; bh=zlc5jVnqARGYoDntu9KNBE/wWPTEyA2DVFPAF7sw2Jo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=KgnYajZ8kD7p+IEvo8q5GhRnWd+T8Upm6rmVEjKCiupck4jkFFLajtRa7BV11T+Mx a2Glr1PfghZF2f2pJP1CGDY5BkKol0yn7+EEo1SO1jtXyn1Jjk0JSHL/e+XzaotX70 hSPxri4OcMnx4DENo8W+ZaLSNzQtDcWZR/TiSzTj1+MKkXK5xurTq2A7e0ZnKsGwHY dM78UAA5gjWnrU7yxG7zmkANfOLEzLkVQKFkf9RhzeHweJAfbN/Fio6OtfmCdgZDl+ x2pJ5c7CgO2zzsh8bE+oqvHS9QVPwV5I0NDyUAXNZdFBAtf5AgRzcS9T9+lIZYNKRV SrbNxTIqaDiow== From: Sasha Levin To: stable@vger.kernel.org Cc: Yao Yiqi , Thomas Zimmermann , Helge Deller , Sasha Levin Subject: [PATCH 6.6.y] fbcon: Rebuild rotated font buffer on font change Date: Wed, 11 Nov 2026 13:56:53 -0500 Message-ID: <20261111185622.3920273-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261107053748-failed-6.6-e4b6b865d45d@kernel.org> References: <20261107053748-failed-6.6-e4b6b865d45d@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yao Yiqi [ Upstream commit e4b6b865d45d8dafb6c6f28c8a993a5b4431d25a ] fbcon_rotate_font() caches a rotated copy of the console font in par->rotated.buf. The buffer is sized from the font's width, height and charcount, and is rebuilt in fbcon_init(), fbcon_switch() and fbcon_modechanged(), but not in fbcon_do_set_font(). When the font is changed through KDFONTOP, the new geometry is installed and vc_resize() redraws before the buffer is rebuilt. The rotated putcs/cursor ops then index the old buffer with the new cell size; KASAN reports a slab-out-of-bounds read in soft_cursor(). Rebuild the buffer for the visible console before the redraw, as the other callers do: select the console's blitting state with set_blitting_type() (which also uploads the new font's map on tile-blitting hardware), then rebuild. Background consoles keep their rebuild at fbcon_switch() time, as the buffer is shared per framebuffer and must not be updated for a console that is not being displayed. To ensure a correct rollback when the rebuild or the following vc_resize() fails, save the rotated font state, clear it before rebuilding, and restore it in the error path of fbcon_do_set_font(). Fixes: 6cc50e1c5b57 ("[PATCH] fbcon: Console Rotation - Add support to rotate font bitmap") Cc: stable@vger.kernel.org Signed-off-by: Yao Yiqi Acked-by: Thomas Zimmermann Signed-off-by: Helge Deller [ sashal: adapted rotated font state handling to use individual fbcon_par fields instead of struct fbcon_rotated ] Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fbcon.c | 57 ++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index 59851d0c50b0a..72c39eafecbdb 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c @@ -2418,6 +2418,12 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, int resize, ret, old_userfont, old_width, old_height, old_charcount; u8 *old_data = vc->vc_font.data; unsigned short old_hi_font_mask = vc->vc_hi_font_mask; +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION + u8 *saved_fontdata = NULL, *saved_fontbuffer = NULL; + u32 saved_fd_size = 0; + int saved_cur_rotate = 0; + bool rotated_saved = false; +#endif resize = (w != vc->vc_font.width) || (h != vc->vc_font.height); vc->vc_font.data = (void *)(p->fontdata = data); @@ -2437,6 +2443,33 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, else if (!vc->vc_hi_font_mask && charcount == 512) set_vc_hi_font(vc, true); + /* + * Select the console's blitting state and update the rotated font buffer + * to match the new font, so that the rendering below does not use a + * cache that was built for the old font. Clear the cached state so + * the rebuild allocates a fresh buffer; the old state is kept until + * the font change can no longer fail. + */ + if (con_is_visible(vc)) { + set_blitting_type(vc, info); + if (par->rotate_font) { +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION + saved_fontdata = par->fontdata; + saved_fontbuffer = par->fontbuffer; + saved_fd_size = par->fd_size; + saved_cur_rotate = par->cur_rotate; + par->fontdata = NULL; + par->fontbuffer = NULL; + par->fd_size = 0; + par->cur_rotate = 0; + rotated_saved = true; +#endif + ret = par->rotate_font(info, vc); + if (ret) + goto err_out; + } + } + if (resize) { int cols, rows; @@ -2453,11 +2486,28 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, update_screen(vc); } +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION + if (rotated_saved) + kfree(saved_fontbuffer); +#endif if (old_userfont && (--REFCOUNT(old_data) == 0)) kfree(old_data - FONT_EXTRA_WORDS * sizeof(int)); return 0; err_out: +#ifdef CONFIG_FRAMEBUFFER_CONSOLE_ROTATION + /* + * Drop the buffer built for the new font and restore the saved + * state. + */ + if (rotated_saved) { + kfree(par->fontbuffer); + par->fontdata = saved_fontdata; + par->fontbuffer = saved_fontbuffer; + par->fd_size = saved_fd_size; + par->cur_rotate = saved_cur_rotate; + } +#endif p->fontdata = old_data; vc->vc_font.data = old_data; @@ -2477,6 +2527,13 @@ static int fbcon_do_set_font(struct vc_data *vc, int w, int h, int charcount, else if (!old_hi_font_mask && vc->vc_hi_font_mask) set_vc_hi_font(vc, false); + /* + * Re-select the blitting type, which re-uploads the font map on + * tile-blitting hardware. + */ + if (con_is_visible(vc)) + set_blitting_type(vc, info); + return ret; } -- 2.53.0