From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A5AF047887B for ; Fri, 15 May 2026 11:31:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778844707; cv=none; b=AGX/OyiJRWktHNs9FcUlT8/7EVCIRZbWSRZDLmfKt9bAITl7mAkuS7EgJgu5d3LT59KFthndDlAnyrLOQu+jcT8uhL8i/RiXjqGy3PNGCft0CGceblKvDhNu+NjCe1mGO+4u0y4hpEX7rhjTb+8Yfcu75tPG+LZVbKZu+C4/5kU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778844707; c=relaxed/simple; bh=E1Q97Ovnph5ZvEPJtFqMTSoFv4RektaI0JFakHaDqCg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cCbeupr/QoqC1STSYijUNuGpCPjk4cv6ypPSQnYHsEd0A5SqOJml5ej7eNkCIxkTQm/mzjVr+erUE0ylqrUHOm1CWLL62RyfPi07U1+/f+azBFzD1Yv37w5y5IhYXh3CAmaWro3iqljlA4y07eOCCXkRLRgNDLRzolUTL80kZpQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tQCHrXr9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tQCHrXr9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A90EC2BCB7; Fri, 15 May 2026 11:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1778844707; bh=E1Q97Ovnph5ZvEPJtFqMTSoFv4RektaI0JFakHaDqCg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tQCHrXr9gtfxnhDpdVUBi6nfk2eIxh5C2PNAUSOGh8vzxIv85azVeq3c/lKKyN/pz D5Tfc28xTdftlsDmzyTHVEhpDI5jIHXvGAJCJVLyxsTKqujarOHhD4pwkAQvpmiF8N Jgom6IdFPT4CAiXqDi/GHRGP0QaYGay773jrn1ZZ6/OdtSvtOHW7GjiukmlrksgOX1 vGso7TqsUV97jifC/4kJlHVVgg9wcbI2dty3LzZYVvdxYA2Xay3rM2YAS2GkQNBLml ygwl7i1zSEcVdqcovLQ6TkAqalvEbRqeCOBUkqX+xk94NecaAby+z80JeHpn4sBwjm +wZF1dOfWE6Ig== From: Sasha Levin To: stable@vger.kernel.org Cc: Thomas Zimmermann , Helge Deller , Sasha Levin Subject: [PATCH 6.1.y] fbcon: Avoid OOB font access if console rotation fails Date: Fri, 15 May 2026 07:31:45 -0400 Message-ID: <20260515113145.2964271-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026051242-aluminum-impotence-8eae@gregkh> References: <2026051242-aluminum-impotence-8eae@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Thomas Zimmermann [ Upstream commit e4ef723d8975a2694cc90733a6b888a5e2841842 ] Clear the font buffer if the reallocation during console rotation fails in fbcon_rotate_font(). The putcs implementations for the rotated buffer will return early in this case. See [1] for an example. Currently, fbcon_rotate_font() keeps the old buffer, which is too small for the rotated font. Printing to the rotated console with a high-enough character code will overflow the font buffer. v2: - fix typos in commit message Signed-off-by: Thomas Zimmermann Fixes: 6cc50e1c5b57 ("[PATCH] fbcon: Console Rotation - Add support to rotate font bitmap") Cc: stable@vger.kernel.org # v2.6.15+ Link: https://elixir.bootlin.com/linux/v6.19/source/drivers/video/fbdev/core/fbcon_ccw.c#L144 # [1] Signed-off-by: Helge Deller [ renamed `par` to `ops` to match the 6.12 local pointer name ] Signed-off-by: Sasha Levin --- drivers/video/fbdev/core/fbcon_rotate.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbcon_rotate.c b/drivers/video/fbdev/core/fbcon_rotate.c index ec3c883400f7b..4a06e71ae4434 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.c +++ b/drivers/video/fbdev/core/fbcon_rotate.c @@ -46,6 +46,10 @@ static int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc) info->fbops->fb_sync(info); if (ops->fd_size < d_cellsize * len) { + kfree(ops->fontbuffer); + ops->fontbuffer = NULL; + ops->fd_size = 0; + dst = kmalloc_array(len, d_cellsize, GFP_KERNEL); if (dst == NULL) { @@ -54,7 +58,6 @@ static int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc) } ops->fd_size = d_cellsize * len; - kfree(ops->fontbuffer); ops->fontbuffer = dst; } -- 2.53.0