From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B6879C79F8C for ; Wed, 9 Sep 2026 09:00:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 61F6410F006; Wed, 9 Sep 2026 09:00:01 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="z7xTRyL1"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="qSI2sFng"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="sPZpMIfe"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="WqWSlJ2b"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 632EB10F004; Wed, 9 Sep 2026 08:59:59 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 632751F7D7; Wed, 9 Sep 2026 08:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788944325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=z7xTRyL1wXVV1rvAQKLCLLva9+HnO24fblx+4pk0rQfgSM978D6npVe59sBGaRfo8iWEnN w8NFSVEozAb3Bj5j5sDkc9EjxSJY6J9NpJLmm9+t+qk0GO8LO6mfPjBldDIV1NOYwDS1AN fVjxRxxYc7lPaQthOIM0KirzHNGODoA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788944325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=qSI2sFngMhRav8YrlXi90/Lyzl0ZJ1ByrFsOUcb9GlvgTv0TSL5pg97Dh9fnl1VU1HAjrw 2KAfBdo/R2pRwwCw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=sPZpMIfe; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=WqWSlJ2b DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788944321; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=sPZpMIfeFaZUQQtiQZ/sEFg6HOXP6u0DKoRb4DawgCdWAmCo6EiKPW0wJ0R6iwUkx0gJC2 7ebkQZYOq+x2gASrv490hnd4vK1KhNSp4oWTyG/SAlC95nEVUibeOwrNw6E8U4Oqdl3dcT aBr2VvUW78lte/WYY0PXyvVj8WpOC1c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788944321; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=WqWSlJ2bdTuzoV9l+0zIrR3vIXcQhiSNiN6NmPT9WHl6pS1NCHHMt6wcoaLjdjYtLNUFhz HB4gY6Wnldd3saCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AC9BD1392A; Wed, 9 Sep 2026 08:58:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SMK4KLsfoWoVUQAAD6G6ig (envelope-from ); Wed, 09 Sep 2026 08:58:35 +0000 From: Thomas Zimmermann To: jfalempe@redhat.com, javierm@redhat.com, airlied@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, geert@linux-m68k.org, rdunlap@infradead.org Cc: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, amd-gfx@lists.freedesktop.org, rust-for-linux@vger.kernel.org, linux-hyperv@vger.kernel.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, virtualization@lists.linux.dev, sashiko-reviews@lists.linux.dev, Thomas Zimmermann Subject: [PATCH v4 07/14] drm/panic: Return from screen_user if display is too small Date: Wed, 9 Sep 2026 10:55:22 +0200 Message-ID: <20260909085826.64529-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909085826.64529-1-tzimmermann@suse.de> References: <20260909085826.64529-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 632751F7D7 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:email,suse.de:mid]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[21]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; FREEMAIL_TO(0.00)[redhat.com,gmail.com,linux.intel.com,kernel.org,linux-m68k.org,infradead.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLo585esf9b7txaosbn5shab9z)]; DKIM_TRACE(0.00)[suse.de:+] X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Return an error if the display is too small to display at least a single character. If the panic handler cannot display any message it does at least not destroy the current output, which might help with identifying the problem. v4: - also check font height against scanout buffer (Jocelyn) Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index f597ef04c5bc..b1cd5e5865a0 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -486,7 +486,7 @@ static int draw_panic_screen_user(struct drm_scanout_buffer *sb, u32 fg_color, u struct drm_rect r_screen, r_logo, r_msg; unsigned int msg_width, msg_height; - if (!font) + if (!font || font->width > sb->width || font->height > sb->height) return -EINVAL; fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); @@ -560,7 +560,7 @@ static int draw_panic_screen_kmsg(struct drm_scanout_buffer *sb, u32 fg_color, u struct drm_panic_line line; int yoffset; - if (!font || font->width > sb->width) + if (!font || font->width > sb->width || font->height > sb->height) return -EINVAL; fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); -- 2.55.0 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 248D4C88E53 for ; Fri, 11 Sep 2026 08:52:12 +0000 (UTC) Received: from kara.freedesktop.org (unknown [131.252.210.166]) by gabe.freedesktop.org (Postfix) with ESMTPS id E311B10F234; Fri, 11 Sep 2026 08:52:11 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="z7xTRyL1"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="qSI2sFng"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=suse.de header.i=@suse.de header.b="sPZpMIfe"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="WqWSlJ2b"; dkim-atps=neutral Received: from kara.freedesktop.org (localhost [127.0.0.1]) by kara.freedesktop.org (Postfix) with ESMTP id 4FBAD4064A; Fri, 11 Sep 2026 08:34:48 +0000 (UTC) ARC-Seal: i=1; cv=none; a=rsa-sha256; d=lists.freedesktop.org; s=20240201; t=1789115688; b=CcDOcgdtdVkIpTKZKD9dVdMRrtYLSIJP5paPJ6KCJ7sWiZPbFeH/G7l6ZPVOwqRs8KswB tg499KPkpAzz87YxAJrAEYT2B68KjUgYdbhA+JxsBZvPBRHOiE6Ol3RdHa5YJbVuaGbInR5 IecyPo4kLM/rcDI12PpHUFgAxKMSsfNkm9yWcw90F8OWqq85xNBgwMrNXHcw6bIYOuk7H2H IIBB3wjjWh44jhmSZHIbi2Suhrhk6iw31RRStkiQ/hszgqo29Z5u/a2efwaspEKj19XVQnE RyjPS0FoIOulYAneEyVkaJ4tppml4Ks0EIhTm/Qsyox6KD93nGtyrPkTLYHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=lists.freedesktop.org; s=20240201; t=1789115688; h=from : sender : reply-to : subject : date : message-id : to : cc : mime-version : content-type : content-transfer-encoding : content-id : content-description : resent-date : resent-from : resent-sender : resent-to : resent-cc : resent-message-id : in-reply-to : references : list-id : list-help : list-unsubscribe : list-subscribe : list-post : list-owner : list-archive; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=UYm6lpjsBGdKAme2o3L7fXoPlA3doeClEz06Zwrb/G6m5B3BC+riKfmdKHIXgVTQQQEHl xZYB4l4fHRr5ls03vW32eIN0JCArEEvNEBOoy4PIawFiBVPJR3+nrzEfEfs0nW5uUImb0EF CxeL5qdfBLbkm9ejfVNMe1B7cvHCdLsXv3PygNN09dYvjPomCgi56tWYZsmCSvm5AagQ4RU kq7xc2BZAx7wDcuoNAuvA4FsHmV/78SM3HeJ7A4ra66KHbXYWztsaEBnLd80LZr7YUoncZw gsx6tM5UZ1Zy9zCF6EX/ZqoU+uNZf8q/ZjdDofSknCYKtwmviAS9CJsSPRog== ARC-Authentication-Results: i=1; mail.freedesktop.org; dkim=pass header.d=suse.de; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=suse.de policy.dmarc=none Authentication-Results: mail.freedesktop.org; dkim=pass header.d=suse.de; arc=none (Message is not ARC signed); dmarc=pass (Used From Domain Record) header.from=suse.de policy.dmarc=none Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by kara.freedesktop.org (Postfix) with ESMTPS id B9644402F0 for ; Fri, 11 Sep 2026 08:34:08 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49E0410F01D for ; Wed, 9 Sep 2026 09:00:11 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 632751F7D7; Wed, 9 Sep 2026 08:58:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788944325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=z7xTRyL1wXVV1rvAQKLCLLva9+HnO24fblx+4pk0rQfgSM978D6npVe59sBGaRfo8iWEnN w8NFSVEozAb3Bj5j5sDkc9EjxSJY6J9NpJLmm9+t+qk0GO8LO6mfPjBldDIV1NOYwDS1AN fVjxRxxYc7lPaQthOIM0KirzHNGODoA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788944325; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=qSI2sFngMhRav8YrlXi90/Lyzl0ZJ1ByrFsOUcb9GlvgTv0TSL5pg97Dh9fnl1VU1HAjrw 2KAfBdo/R2pRwwCw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1788944321; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=sPZpMIfeFaZUQQtiQZ/sEFg6HOXP6u0DKoRb4DawgCdWAmCo6EiKPW0wJ0R6iwUkx0gJC2 7ebkQZYOq+x2gASrv490hnd4vK1KhNSp4oWTyG/SAlC95nEVUibeOwrNw6E8U4Oqdl3dcT aBr2VvUW78lte/WYY0PXyvVj8WpOC1c= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1788944321; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gROToXlK8SjdMBn2SBlcMsgteVlZQArVpFSxxwGrkhg=; b=WqWSlJ2bdTuzoV9l+0zIrR3vIXcQhiSNiN6NmPT9WHl6pS1NCHHMt6wcoaLjdjYtLNUFhz HB4gY6Wnldd3saCw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id AC9BD1392A; Wed, 9 Sep 2026 08:58:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id SMK4KLsfoWoVUQAAD6G6ig (envelope-from ); Wed, 09 Sep 2026 08:58:35 +0000 From: Thomas Zimmermann To: jfalempe@redhat.com, javierm@redhat.com, airlied@gmail.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, geert@linux-m68k.org, rdunlap@infradead.org Subject: [PATCH v4 07/14] drm/panic: Return from screen_user if display is too small Date: Wed, 9 Sep 2026 10:55:22 +0200 Message-ID: <20260909085826.64529-8-tzimmermann@suse.de> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260909085826.64529-1-tzimmermann@suse.de> References: <20260909085826.64529-1-tzimmermann@suse.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Action: no action X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 632751F7D7 X-Spamd-Result: default: False [-3.01 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; URIBL_BLOCKED(0.00)[imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo,suse.de:dkim,suse.de:email,suse.de:mid]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_TWELVE(0.00)[21]; TO_DN_SOME(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_MATCH_ENVRCPT_ALL(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,suse.de:mid,imap1.dmz-prg2.suse.org:rdns,imap1.dmz-prg2.suse.org:helo]; FREEMAIL_TO(0.00)[redhat.com,gmail.com,linux.intel.com,kernel.org,linux-m68k.org,infradead.org]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLo585esf9b7txaosbn5shab9z)]; DKIM_TRACE(0.00)[suse.de:+] Message-ID-Hash: IP22XMLES5TP46QMMXFHTRO4JNVO3U5B X-Message-ID-Hash: IP22XMLES5TP46QMMXFHTRO4JNVO3U5B X-MailFrom: tzimmermann@suse.de X-Mailman-Rule-Hits: member-moderation X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address CC: dri-devel@lists.freedesktop.org, linux-doc@vger.kernel.org, amd-gfx@lists.freedesktop.org, rust-for-linux@vger.kernel.org, linux-hyperv@vger.kernel.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, nouveau@lists.freedesktop.org, linux-renesas-soc@vger.kernel.org, virtualization@lists.linux.dev, sashiko-reviews@lists.linux.dev X-Mailman-Version: 3.3.8 Precedence: list List-Id: Nouveau development list Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Return an error if the display is too small to display at least a single character. If the panic handler cannot display any message it does at least not destroy the current output, which might help with identifying the problem. v4: - also check font height against scanout buffer (Jocelyn) Signed-off-by: Thomas Zimmermann Reviewed-by: Jocelyn Falempe --- drivers/gpu/drm/drm_panic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index f597ef04c5bc..b1cd5e5865a0 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -486,7 +486,7 @@ static int draw_panic_screen_user(struct drm_scanout_buffer *sb, u32 fg_color, u struct drm_rect r_screen, r_logo, r_msg; unsigned int msg_width, msg_height; - if (!font) + if (!font || font->width > sb->width || font->height > sb->height) return -EINVAL; fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); @@ -560,7 +560,7 @@ static int draw_panic_screen_kmsg(struct drm_scanout_buffer *sb, u32 fg_color, u struct drm_panic_line line; int yoffset; - if (!font || font->width > sb->width) + if (!font || font->width > sb->width || font->height > sb->height) return -EINVAL; fg_color = drm_draw_color_from_xrgb8888(fg_color, sb->format->format); -- 2.55.0