From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dy2-f6.google.com (mail-dy2-f6.google.com [74.125.229.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4737D3E6DF7 for ; Fri, 16 Oct 2026 07:31:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.229.6 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792135869; cv=none; b=gIXQHyWMbTjorJQqeopxr3uI34AYc5hPcegZ7zJy1zH9f19h66fQmCzCZP5FzJAXl+ELlan3bUaSiB+Jznm1BONp7uM06O8gwUXKQzsUuGg3MzhXFhiv3JmSSZDGdbGP48hninPhEhyLUB2ujJspg595YMexxPqqWiX3ikK9Quc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1792135869; c=relaxed/simple; bh=EYKrpQNXUZLMLH91IigMMSKgsDt3PECDKGyBUPZCHko=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WWHzlijwOL+wLNFUh6TP/EOjhuwYErVeCVkZV+0VgSshfH7PpcHLEjMuHNccPg7/6sSOTTOz9W1qmtIJpJIndRgglKfBZayS/985UCSvLWQ0uSsvaPffJ4Jmfp9Dm53RRdWa16y/xn+dAP9dHDugRswCDcPYxJFVpvjsgrVHN7c= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=InKOfpNx; arc=none smtp.client-ip=74.125.229.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="InKOfpNx" Received: by mail-dy2-f6.google.com with SMTP id 5a478bee46e88-3599f43e0aeso1369641eec.0 for ; Fri, 16 Oct 2026 00:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1792135866; x=1792740666; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=8JLrQsk/HzdxZDjqIwFPPIYECJQe+WNmXx2ayIsdeN4=; b=InKOfpNxDoCKiWXOFhLfkR0aaCD2ZoBxrXZ0lN0iXWwHG2H3FOlwrDkbNgiPJ5XP7L S3yVIM5tfYFrN1r0DiQdlYcJm3oQhk+pTeNAwPKNWm+uuAAYKu+vxBaIdAfPTcyzkVIC Q0D3dXJvaRVAMswsYmXv5+t+idoMxNmL/QNHmlSE9XudvAMnbYGDprYh91MxmhCxwDFx DCtXaa88SZlZRGLbE7sZx0eeOt3uduTd4nil1/Q4KfOq0Kqen9CFyk040A4blZQgHCni UGgu3joNl3JbNEen7/HvsVHOfHcohc8Mui59dXowNRk0OJzZOtu9m89NqAZKk/GKQOA7 mMbw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792135866; x=1792740666; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=8JLrQsk/HzdxZDjqIwFPPIYECJQe+WNmXx2ayIsdeN4=; b=N/UeXRhEdu1WyacYyUXikk7HXzd8BQoVy/N+eNE918LoiUytLXtyKeaGU4Sapvha2e 4Yw7N+bV49bfNl8aHH0XyQOqgP7GGVAQOP7JL2bCUwHuLLPjfVexkkbTD0KNlUPVOaHx tiZ+voe7wPpyLawZJzd8eMfw9TM3RtFo036wk+ctpsiPG2ioO2cJMNzzqExqy7OCT76m LBq0Ve4GmTaZjD1Mv1+rJCaGo23LDKE2AuDgcMECwdL4edMHWgtbLpTg4yJOBqk3H+u4 /VzUII/GpmrsyUti1ac7RZxC4WwDGUwWN96/6XRo11id8irESyoqW8L+pgtmGy89qAgZ IbWA== X-Forwarded-Encrypted: i=1; AKwUvBwipw5NSLol86TNuExdyZqtJsGAeNDTXVVFGJhLMfjuSwIwdk/lsYcWqAc1I0QAsBqToknD+VY=@vger.kernel.org X-Gm-Message-State: AFq9FYJgH1tJMjRblDx7A/lo1AK0KLYHnE4DTNbJWkALTUqU1tz8n59o xnm9lm4xb1yrU9ZM5OixM3G5hVgyzNa1TJ26P3Z2SQ+J3RbQtU1hA0El X-Gm-Gg: AYBFou2oGyjeKkyFsv6m52zECVHRb+8FbEgkOYFxtINjt1X7qz/IGwwW2lynVjmlRel TKzEpF/O2Zp0yKK8UmMKgGZHSGyRvh0IeTsfuLT8ieDclLDmgvXz4kE6gSmYkn5OSh4iQRFKp4c un7KJcI0d+uvWkvCyH/N84IjZ196i863BVrmRFowWrXLAr9NQBkDYaDERTwFsoytrYIfy1u84US N3C6AEj78c/zgq+YepQ+ZMWS9OUiF0b8ze1lVvKSeZ01FbHJSSQJuz4QoAuiVihfAWvl9DF01FP 9C4tGBjafsSyXA09mZJAi8BlbBR0WqreWblc9DE/tWvTdYY79WTg3mbFaKoSygqKrC5Pqpn7rQh was47jY3HFuCCd3LSH9OzXA2QrFbIThkKjgPv12m7Hyr+a/QtE9YAB14SDYBZT2zz/8Wo+zKqMY JZfNbG+IlOeuDzDSzRnR6BsYQmboc7PJitpMz9PCiAylMIpAO4FaC/rK+9aV5DBZQZqFkxRvmon 83dgtzTrWUsPankx99OMLU6D8ze8+3bJ9Y= X-Received: by 2002:a05:701b:454b:10b0:14d:baf5:c40e with SMTP id a92af1059eb24-16a5faa76admr26546434c88.8.1792135866370; Fri, 16 Oct 2026 00:31:06 -0700 (PDT) Received: from blue.tailcc13ef.ts.net (104.194.64.109.16clouds.com. [104.194.64.109]) by smtp.gmail.com with ESMTPSA id a92af1059eb24-1831a6f58c2sm5367021c88.11.2026.10.16.00.31.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2026 00:31:05 -0700 (PDT) From: Yao Yiqi To: deller@gmx.de, tzimmermann@suse.de, simona@ffwll.ch Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-kernel@vger.kernel.org, yaoyiqi3@huawei.com, Yao Yiqi , stable@vger.kernel.org Subject: [PATCH v3 3/3] fbcon: Retry rotated font allocation after failure Date: Fri, 16 Oct 2026 15:30:23 +0800 Message-ID: <20261016073023.490430-4-yyaqia@gmail.com> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261016073023.490430-1-yyaqia@gmail.com> References: <20261016073023.490430-1-yyaqia@gmail.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Yao Yiqi fbcon_rotate_font() records the font, its geometry and the rotation it is about to handle in par->rotated before calling font_data_rotate(). If the allocation fails, the error path clears par->rotated.buf, but the recorded font, geometry and rotation already look up to date, so the next call takes the early-out and never retries. The rotated putcs/cursor ops keep returning early on the NULL buffer and the console stays blank until a font or rotation with a different key is installed, even once memory is available again. Also test par->rotated.buf in the early-out, so a failed allocation is retried the next time fbcon_rotate_font() runs: at the next fbcon_switch(), fbcon_modechanged() or font change. Fixes: e4ef723d8975 ("fbcon: Avoid OOB font access if console rotation fails") Cc: stable@vger.kernel.org Signed-off-by: Yao Yiqi --- Changes in v2: - The early-out now also compares the font geometry (previous patch in this series); the retry covers the combined key. --- drivers/video/fbdev/core/fbcon_rotate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/video/fbdev/core/fbcon_rotate.c b/drivers/video/fbdev/core/fbcon_rotate.c index 660a3fa81bae..7afd63dcee7b 100644 --- a/drivers/video/fbdev/core/fbcon_rotate.c +++ b/drivers/video/fbdev/core/fbcon_rotate.c @@ -25,7 +25,8 @@ int fbcon_rotate_font(struct fb_info *info, struct vc_data *vc) par->rotate == par->rotated.buf_rotate && vc->vc_font.width == par->rotated.buf_width && vc->vc_font.height == par->rotated.buf_height && - vc->vc_font.charcount == par->rotated.buf_charcount) + vc->vc_font.charcount == par->rotated.buf_charcount && + par->rotated.buf) return 0; par->rotated.fontdata = par->p->fontdata; -- 2.56.0