From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 AABA32E5406 for ; Thu, 9 Oct 2025 12:30:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013026; cv=none; b=p7+F3JF2j6xlRFY/OQm/HX7VAtmHxjX8at+iXO8rd7/S9sEp/Y9en+n/bvhCkM8OdAGG2puyTeQsoOig7r3qfHGkj2v9mfStpEZ3kltDBIPAu+PrFYP1Be5/VWenJyCVu/eZHE7MbnIyzJ76NvC9HX/KldHbRkMn/kBPQyOqCcM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013026; c=relaxed/simple; bh=M+3YAASa1CI+N7TinZJVxMAa56QlE5vpVGRMhWYveOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pHpxkRgyrN1GTLXLqleyhswjAArsiuD14LNLBkxr6gm1vZAe1ekyrtABXS8rELI7t+jqDq7NyH3iUd6mAQprAwzQsHRL9tt018dWe144uFeYfC1nxrTs8Ur4XjtrWcVEK0WOyBWnUB29p/+eEixMGIi1EerXZgefY5AhpYmw1bQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=DoHmkTYQ; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="DoHmkTYQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013022; h=from:from:reply-to:subject:subject: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=fMM/vJwKTSF+IolScmN40UJvXxykm6btY/TgTkySF4o=; b=DoHmkTYQZPnb00zSC8XcPxblyG9TNbTkHeS6lOSeZucb9mntbLH/1OBeGSpoC442nP0iNR pBjRrvkELKrVGXXF9SHvjETnbsDvgKgkeSo0KCR1FZwNTxzQ+lcGQieGD+RjLhJa+kF1Q4 bL1sEyPof8Tb6/uJMz9QC6r0shJWZWg= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-683-6q2-DYFRMbmRMX3SUtQhhw-1; Thu, 09 Oct 2025 08:30:19 -0400 X-MC-Unique: 6q2-DYFRMbmRMX3SUtQhhw-1 X-Mimecast-MFC-AGG-ID: 6q2-DYFRMbmRMX3SUtQhhw_1760013018 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 0A91C1956086; Thu, 9 Oct 2025 12:30:18 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6F26818004D8; Thu, 9 Oct 2025 12:30:13 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 1/6] drm/panic: Fix drawing the logo on a small narrow screen Date: Thu, 9 Oct 2025 14:24:48 +0200 Message-ID: <20251009122955.562888-2-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" If the logo width is bigger than the framebuffer width, and the height is big enough to hold the logo and the message, it will draw at x coordinate that are higher than the width, and ends up in a corrupted image. Fixes: 4b570ac2eb54 ("drm/rect: Add drm_rect_overlap()") Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 1d6312fa1429..23ba791c6131 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -429,6 +429,9 @@ static void drm_panic_logo_rect(struct drm_rect *rect, = const struct font_desc *f static void drm_panic_logo_draw(struct drm_scanout_buffer *sb, struct drm_= rect *rect, const struct font_desc *font, u32 fg_color) { + if (rect->x2 > sb->width || rect->y2 > sb->height) + return; + if (logo_mono) drm_panic_blit(sb, rect, logo_mono->data, DIV_ROUND_UP(drm_rect_width(rect), 8), 1, fg_color); --=20 2.51.0 From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 D32932E2850 for ; Thu, 9 Oct 2025 12:30:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013030; cv=none; b=GaazLFnmLjeWxzyRPOG6dAvVEPUWwEvD2XRuF3SiO43yPTXP1NOUA7m+MimJMdQuddPbWVC2Zuk6wYAmCVLu+t2DPO7ocvtieHpUrFPUxPtnvcJvFI3K7KqxM0uz8c/CBWq+xBP3xv8HQYYh2ItUPcp/NNvIR1miyaxHU46D35M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013030; c=relaxed/simple; bh=43F5c+zaUZG6YJN+thQRVnYCUYyJL65rXk0RmVSUeQM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ao1B4CvoQsCMqyAH/DsukIDLulEcBMYpDCUoRPYYlfqYGSZdoNJxgYl0gWJYJ70gd8RYYB4gsy6dQKX7X4yTXDJUZQfwkdzfGpoFJLloWty5Nf2TG9mp7DMXuDjkmDKOhwau8AvIqI/j7keeqx9q/+XRDqSJOgmnDa0FGPf0p9U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=I8AtabTW; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="I8AtabTW" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013027; h=from:from:reply-to:subject:subject: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=+jU6y3U31OtGeGVZmCu0gO04BJwFhkS/aeWCbYDaXik=; b=I8AtabTWNJmP4yrts2PH06zERAcbrNMPFBqwP1az6/DWSSYbbYZOiFw5HYazCnvRKx95QO DPhRBCC1PdtdIaS7pKLqodyvsN/fFySd54jYF/vKO9fAK0aejAlkpBCpDRHkPtH4bFTvK2 uyBGFdT8lWGN/I0D/fYYh8bK8/pGr+k= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-185-q1Xljwk-N8-wwzTwoFRdAg-1; Thu, 09 Oct 2025 08:30:23 -0400 X-MC-Unique: q1Xljwk-N8-wwzTwoFRdAg-1 X-Mimecast-MFC-AGG-ID: q1Xljwk-N8-wwzTwoFRdAg_1760013022 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 357A6180048E; Thu, 9 Oct 2025 12:30:22 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BD2E318004D8; Thu, 9 Oct 2025 12:30:18 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 2/6] drm/panic: Fix overlap between qr code and logo Date: Thu, 9 Oct 2025 14:24:49 +0200 Message-ID: <20251009122955.562888-3-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" The borders of the qr code was not taken into account to check if it overlap with the logo, leading to the logo being partially covered. Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 23ba791c6131..179cbf21f22d 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -749,7 +749,7 @@ static int _draw_panic_static_qr_code(struct drm_scanou= t_buffer *sb) /* Fill with the background color, and draw text on top */ drm_panic_fill(sb, &r_screen, bg_color); =20 - if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_q= r)) + if (!drm_rect_overlap(&r_logo, &r_msg) && !drm_rect_overlap(&r_logo, &r_q= r_canvas)) drm_panic_logo_draw(sb, &r_logo, font, fg_color); =20 draw_txt_rectangle(sb, font, panic_msg, panic_msg_lines, true, &r_msg, fg= _color); --=20 2.51.0 From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 C87362E7167 for ; Thu, 9 Oct 2025 12:30:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013035; cv=none; b=us6+H50FszUZeCfUPJX6fpSEDVmffQN/+zVV0OFQOwWX6HZPbIF2nDgdJmJMPxwBR53i8/m+SN0AS0Ds9WIDmg+nI1lvAvZ742FbxWNGBvvuMxCqLEVVnoXfidb5ZxA4KldST2ypv8B8/5CLLAydlF86HtTEFPNdBTJ0iwFQ+ek= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013035; c=relaxed/simple; bh=gUEahKKYOUH2kVxO/lDajkAlCzV30k4qOuQ5Yr4X7sc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UFtkT15o2gSKhqYZTPNa3rDx2sZgOTNH8V9ESPVlKbQc3v6l2nc48sYgwHaPRrGAe7NHzX5OzUR5QvPKp290mLYk3xhwXhdTrYaWhm6OivOuNdfY0OaoGfCf0btx5C9iukfj++xSBXdUBS1VExzinsHrGPuTThSVntXFNMJ8zlY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=CihcOl6U; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="CihcOl6U" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013032; h=from:from:reply-to:subject:subject: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=aSDCPJnmMxBRqtQR+6ffqI3zTDae1cNcYyEpjejHE4g=; b=CihcOl6U9BqrMWtl/3AEzvwbB9Ps+uXqgeO4kF3W1zlolAO7NyfhtSbJyKdk83ME+h+5tQ MYeCTVkHO1NoYFYNkmxaCCRb+BFmPH5dDRVfi4jjPJQ12Ro4XuKNoXDNNjo09MsMdoLdEZ YAePKA2ZcXMeHDnZhdwGZZQajBIEj0k= Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-47-_mRjGOe-N1COQ5vjhdKE7A-1; Thu, 09 Oct 2025 08:30:27 -0400 X-MC-Unique: _mRjGOe-N1COQ5vjhdKE7A-1 X-Mimecast-MFC-AGG-ID: _mRjGOe-N1COQ5vjhdKE7A_1760013026 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2AF7519560BB; Thu, 9 Oct 2025 12:30:26 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id B92191800982; Thu, 9 Oct 2025 12:30:22 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 3/6] drm/panic: Fix qr_code, ensure vmargin is positive Date: Thu, 9 Oct 2025 14:24:50 +0200 Message-ID: <20251009122955.562888-4-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" Depending on qr_code size and screen size, the vertical margin can be negative, that means there is not enough room to draw the qr_code. So abort early, to avoid a segfault by trying to draw at negative coordinates. Fixes: cb5164ac43d0f ("drm/panic: Add a QR code panic screen") Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 179cbf21f22d..281bb2dabf81 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -736,7 +736,10 @@ static int _draw_panic_static_qr_code(struct drm_scano= ut_buffer *sb) pr_debug("QR width %d and scale %d\n", qr_width, scale); r_qr_canvas =3D DRM_RECT_INIT(0, 0, qr_canvas_width * scale, qr_canvas_wi= dth * scale); =20 - v_margin =3D (sb->height - drm_rect_height(&r_qr_canvas) - drm_rect_heigh= t(&r_msg)) / 5; + v_margin =3D sb->height - drm_rect_height(&r_qr_canvas) - drm_rect_height= (&r_msg); + if (v_margin < 0) + return -ENOSPC; + v_margin /=3D 5; =20 drm_rect_translate(&r_qr_canvas, (sb->width - r_qr_canvas.x2) / 2, 2 * v_= margin); r_qr =3D DRM_RECT_INIT(r_qr_canvas.x1 + QR_MARGIN * scale, r_qr_canvas.y1= + QR_MARGIN * scale, --=20 2.51.0 From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 A49551DE8B3 for ; Thu, 9 Oct 2025 12:30:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013037; cv=none; b=Hp862nK9Pd7kS+qo8od/VKtBXWB6Y/JpMDOJQWfCZoBl1M12LBJ8kfDub88NipCCGNxmmg6BQ09zR2JFj6ai+9+InG3S8nvLQMIzrHoLe1jAjSIowqoe7xVJd//2nbyWmzSN5OO8qogPTpkCLaYlcTm8QKjDccwBXaHBFb7v7b8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013037; c=relaxed/simple; bh=ahnJZzshkbAzztwY8DP7LLZVcRRjoHIOwAzHXcWnWu8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FApeQ64PKlYnx1EvCTdDfDvZ9sBxqrNTQlSEdQLQuJ99hlasg9sd4TjSKVPC51GQVKXlO1Gjkc57B9cHD3iFRByiSAhvE7pk8Nk/n5y87EV3CytwWYbiPv4vmUXJ4My1PTMqbW9tFiWUX5JxFYEakJuRjd6PN4wVYX/ySrF9kVM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=P8M34YuB; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="P8M34YuB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013034; h=from:from:reply-to:subject:subject: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=AVnWA8siyJ1iu9LLrS4EF3aim8A6hSTw9/7vlialzfo=; b=P8M34YuBeR/YqmZWbmJKdFLoiku1dFazCHjdhcvOm/mZ1lB+gnIHY+gJPCl7JOVBZ6DExu xAHKzi1pN544pAqOjBp2T66FePgVRPRq6Brl9yJoEaBEKQg2e5s1y9/1H8rJJzKJn3GqiV sr5BFnqYCxnoWJSTYKyBPOQL/kEIHok= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-UkBmwH_WPS27Jk6hPxG6Gg-1; Thu, 09 Oct 2025 08:30:31 -0400 X-MC-Unique: UkBmwH_WPS27Jk6hPxG6Gg-1 X-Mimecast-MFC-AGG-ID: UkBmwH_WPS27Jk6hPxG6Gg_1760013030 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 3DE1B19560AA; Thu, 9 Oct 2025 12:30:30 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AC178180035E; Thu, 9 Oct 2025 12:30:26 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 4/6] drm/panic: Fix kmsg text drawing rectangle Date: Thu, 9 Oct 2025 14:24:51 +0200 Message-ID: <20251009122955.562888-5-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" The rectangle height was larger than the screen size. This has no real impact. Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 281bb2dabf81..69be9d835ccf 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -480,7 +480,7 @@ static int draw_line_with_wrap(struct drm_scanout_buffe= r *sb, const struct font_ struct drm_panic_line *line, int yoffset, u32 fg_color) { int chars_per_row =3D sb->width / font->width; - struct drm_rect r_txt =3D DRM_RECT_INIT(0, yoffset, sb->width, sb->height= ); + struct drm_rect r_txt =3D DRM_RECT_INIT(0, yoffset, sb->width, font->heig= ht); struct drm_panic_line line_wrap; =20 if (line->len > chars_per_row) { --=20 2.51.0 From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 E47B02E2DDC for ; Thu, 9 Oct 2025 12:30:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013045; cv=none; b=lbJlctdqX8fpeoDXbF+yTOxLrYUbcicibprQ07ODBqVlMh94yvFF3JLQH5P2XZLWKR23MUj0hSFgNv5RfHsxwDZ1Ab5QpvDP/0VairmofsErm558bkmYVYwaExb8azg4bV5ATZmw2001mJxqsAwQTq39s6yXhvBC7ca9q6YRyWI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013045; c=relaxed/simple; bh=x/xBOWDUp28sfsBV56l3ubXJEEtbz5ccQGgEvAY4eak=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gJigqLBFagYlNFQXSmAT2nnqcNM6N4L4z/IOOITJOVIIxpZYy+GuQHervVvkiC4zvQ2jwtevf4msMBKoTBvuiSSQi/lthfz0g8leLsbFm3BU1Iw4MdtqD/KVKASGmgGGzAAFhrKXawCgFLozTpGXBmTQA0Cj5RdXhzMAld1+0so= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LB5eQYYx; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LB5eQYYx" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013042; h=from:from:reply-to:subject:subject: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=Cn5dPHJR4fGLCx+LL6EWkDNRU/ebLqiGoCggED75pSc=; b=LB5eQYYxBd7yG1Q2oxK2Ldxr0SmVHRyUMafz8xoXjNczNVl9uouSWIFrn1zk5z6LIQrvLx G+8fefhE9lDJYWm7H0JjQq7Z4ln/8Rc1MqY5BE4se0w+wDr1vzqKXTJFXHd3kW4HZJ3lkq hWnr849hCcDgIF9on7/bMxFRPnfq9Sc= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-15-uVIGwZ_LMbGTAMeUefY4JQ-1; Thu, 09 Oct 2025 08:30:35 -0400 X-MC-Unique: uVIGwZ_LMbGTAMeUefY4JQ-1 X-Mimecast-MFC-AGG-ID: uVIGwZ_LMbGTAMeUefY4JQ_1760013034 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 288F4195608E; Thu, 9 Oct 2025 12:30:34 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id BEF51180035E; Thu, 9 Oct 2025 12:30:30 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 5/6] drm/panic: Fix divide by 0 if the screen width < font width Date: Thu, 9 Oct 2025 14:24:52 +0200 Message-ID: <20251009122955.562888-6-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" In the unlikely case that the screen is tiny, and smaller than the font width, it leads to a divide by 0: draw_line_with_wrap() chars_per_row =3D sb->width / font->width =3D 0 line_wrap.len =3D line->len % chars_per_row; This will trigger a divide by 0 Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index 69be9d835ccf..bc5158683b2b 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -523,7 +523,7 @@ static void draw_panic_static_kmsg(struct drm_scanout_b= uffer *sb) struct drm_panic_line line; int yoffset; =20 - if (!font) + if (!font || font->width > sb->width) return; =20 yoffset =3D sb->height - font->height - (sb->height % font->height) / 2; --=20 2.51.0 From nobody Sun Feb 8 11:06:47 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (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 444BB2E267D for ; Thu, 9 Oct 2025 12:30:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013044; cv=none; b=ii9PFO2YRylvp5vxe/Ctcdw62gTx9c8+U6jv22opnQLW+9o+I/ALtZ02YJNshykNO7BCjhfZ4FMVjK45/6uh/SuZqxngoxp1BvWa5DJm/4caSXS60nlFP9eNlE9VlmqKijS8xTk+jJPuxjYJn/WOKADol2ZWBBP4IcEP8fYMbo0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760013044; c=relaxed/simple; bh=t9ylgHY+PljaKu8kJBcIBeNSsNWev04iThKtIuBpAP8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Rl82nhGU5isF18alE9n51oSP58VcBtOuRWjhsXJvaxsDQdSf3CEPDtDhD3FfLeHtjNLZLOIxk6M5F8BxfmiWZJ9II/UtYJ48WHXdb80b/YVqu/QCGmyoRs+4zJjyyMxwT4msqr2V3s5vbMrXp3tFF/3GWOvPFfaPg2eQoS//aec= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=LxfF2qG5; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="LxfF2qG5" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1760013042; h=from:from:reply-to:subject:subject: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=hyzFZxJbO2L5avzgNukRA/OHc7c+vIBxWzW6CopjW/U=; b=LxfF2qG58XU55Lx3CEY7AxaDL+/Gqk6jF6+f9HpbJybSC/wpXzVsFi9DjE+0YJ/vkDtdxM fanpHD+NOb1yFZ4pan9X36uUgFGYUgIFDNTShbTZymotuRpHeyH11AyfVl62baprlLEDYI cNa9oYSx1afxHf16muKkaubwJCgQ5qw= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-303-Ys3Hi_-hOVit_MVKA0Ie8g-1; Thu, 09 Oct 2025 08:30:39 -0400 X-MC-Unique: Ys3Hi_-hOVit_MVKA0Ie8g-1 X-Mimecast-MFC-AGG-ID: Ys3Hi_-hOVit_MVKA0Ie8g_1760013038 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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 mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 027001800587; Thu, 9 Oct 2025 12:30:38 +0000 (UTC) Received: from hydra.redhat.com (unknown [10.45.225.212]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A9328180035E; Thu, 9 Oct 2025 12:30:34 +0000 (UTC) From: Jocelyn Falempe To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Jocelyn Falempe , Javier Martinez Canillas , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: stable@vger.kernel.org Subject: [PATCH 6/6] drm/panic: Fix 24bit pixel crossing page boundaries Date: Thu, 9 Oct 2025 14:24:53 +0200 Message-ID: <20251009122955.562888-7-jfalempe@redhat.com> In-Reply-To: <20251009122955.562888-1-jfalempe@redhat.com> References: <20251009122955.562888-1-jfalempe@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" When using page list framebuffer, and using RGB888 format, some pixels can cross the page boundaries, and this case was not handled, leading to writing 1 or 2 bytes on the next virtual address. Add a check and a specific function to handle this case. Fixes: c9ff2808790f0 ("drm/panic: Add support to scanout buffer as array of= pages") Signed-off-by: Jocelyn Falempe Reviewed-by: Javier Martinez Canillas --- drivers/gpu/drm/drm_panic.c | 46 +++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c index bc5158683b2b..d4b6ea42db0f 100644 --- a/drivers/gpu/drm/drm_panic.c +++ b/drivers/gpu/drm/drm_panic.c @@ -174,6 +174,33 @@ static void drm_panic_write_pixel24(void *vaddr, unsig= ned int offset, u32 color) *p =3D color & 0xff; } =20 +/* + * Special case if the pixel crosses page boundaries + */ +static void drm_panic_write_pixel24_xpage(void *vaddr, struct page *next_p= age, + unsigned int offset, u32 color) +{ + u8 *vaddr2; + u8 *p =3D vaddr + offset; + + vaddr2 =3D kmap_local_page_try_from_panic(next_page); + + *p++ =3D color & 0xff; + color >>=3D 8; + + if (offset =3D=3D PAGE_SIZE - 1) + p =3D vaddr2; + + *p++ =3D color & 0xff; + color >>=3D 8; + + if (offset =3D=3D PAGE_SIZE - 2) + p =3D vaddr2; + + *p =3D color & 0xff; + kunmap_local(vaddr2); +} + static void drm_panic_write_pixel32(void *vaddr, unsigned int offset, u32 = color) { u32 *p =3D vaddr + offset; @@ -231,7 +258,14 @@ static void drm_panic_blit_page(struct page **pages, u= nsigned int dpitch, page =3D new_page; vaddr =3D kmap_local_page_try_from_panic(pages[page]); } - if (vaddr) + if (!vaddr) + continue; + + // Special case for 24bit, as a pixel might cross page boundaries + if (cpp =3D=3D 3 && offset + 3 > PAGE_SIZE) + drm_panic_write_pixel24_xpage(vaddr, pages[page + 1], + offset, fg32); + else drm_panic_write_pixel(vaddr, offset, fg32, cpp); } } @@ -321,7 +355,15 @@ static void drm_panic_fill_page(struct page **pages, u= nsigned int dpitch, page =3D new_page; vaddr =3D kmap_local_page_try_from_panic(pages[page]); } - drm_panic_write_pixel(vaddr, offset, color, cpp); + if (!vaddr) + continue; + + // Special case for 24bit, as a pixel might cross page boundaries + if (cpp =3D=3D 3 && offset + 3 > PAGE_SIZE) + drm_panic_write_pixel24_xpage(vaddr, pages[page + 1], + offset, color); + else + drm_panic_write_pixel(vaddr, offset, color, cpp); } } if (vaddr) --=20 2.51.0