From: Jocelyn Falempe <jfalempe@redhat.com>
To: Nathan Chancellor <nathan@kernel.org>,
Javier Martinez Canillas <javierm@redhat.com>,
Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>,
Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH 1/2] drm/panic: Ensure drm_panic_type is initialized to a valid value
Date: Tue, 6 Jan 2026 22:32:58 +0100 [thread overview]
Message-ID: <76fb4c29-2c7b-4971-92d6-365b5782aec6@redhat.com> (raw)
In-Reply-To: <20260105-drm_panic-handle-invalid-drm_panic_screen-v1-1-55228bd4b0f8@kernel.org>
On 06/01/2026 07:19, Nathan Chancellor wrote:
> If a user has set an invalid CONFIG_DRM_PANIC_SCREEN value (such as
> "qr_code" without CONFIG_DRM_PANIC_SCREEN_QR_CODE=y due to missing or
> incorrect Rust dependencies), there is a panic when accessing
> /sys/module/drm/parameters/panic_screen:
>
> [ 12.218375] BUG: unable to handle page fault for address: 0000000796dd8818
> [ 12.219737] #PF: supervisor read access in kernel mode
> ...
> [ 12.227167] RIP: 0010:drm_panic_type_get+0x1b/0x30
>
> If drm_panic_type_set() does not find a valid drm_panic_type enumeration
> in drm_panic_type_map based on the provided value, it does not change
> drm_panic_type from the default -1 value, which is not a valid index for
> accessing drm_panic_type_map in drm_panic_type_get(), resulting in the
> crash.
>
> Validate the value of CONFIG_DRM_PANIC_SCREEN at boot time via the
> return value of drm_panic_type_set() in drm_panic_init() and explicitly
> fall back to the default of "user" with a message to the user so that
> they can adjust their configuration or fix missing dependencies.
>
> [ 0.800697] Unsupported value for CONFIG_DRM_PANIC_SCREEN ('qr_code'), falling back to 'user'...
>
Good catch, thanks for the fix.
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
> Fixes: e85e9ccf3f84 ("drm/panic: Report invalid or unsupported panic modes")
> Signed-off-by: Nathan Chancellor <nathan@kernel.org>
> ---
> drivers/gpu/drm/drm_panic.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/drm_panic.c b/drivers/gpu/drm/drm_panic.c
> index eb7ef17b9c71..0cd574dd9d88 100644
> --- a/drivers/gpu/drm/drm_panic.c
> +++ b/drivers/gpu/drm/drm_panic.c
> @@ -1072,8 +1072,11 @@ void drm_panic_unregister(struct drm_device *dev)
> */
> void __init drm_panic_init(void)
> {
> - if (drm_panic_type == -1)
> - drm_panic_type_set(CONFIG_DRM_PANIC_SCREEN, NULL);
> + if (drm_panic_type == -1 && drm_panic_type_set(CONFIG_DRM_PANIC_SCREEN, NULL)) {
> + pr_warn("Unsupported value for CONFIG_DRM_PANIC_SCREEN ('%s'), falling back to 'user'...\n",
> + CONFIG_DRM_PANIC_SCREEN);
> + drm_panic_type = DRM_PANIC_TYPE_USER;
> + }
> drm_panic_qr_init();
> }
>
>
next prev parent reply other threads:[~2026-01-06 21:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-01-06 6:19 [PATCH 0/2] drm/panic: Avoid crash from invalid CONFIG_DRM_PANIC_SCREEN values Nathan Chancellor
2026-01-06 6:19 ` [PATCH 1/2] drm/panic: Ensure drm_panic_type is initialized to a valid value Nathan Chancellor
2026-01-06 8:24 ` Tvrtko Ursulin
2026-01-06 21:32 ` Jocelyn Falempe [this message]
2026-01-06 6:19 ` [PATCH 2/2] drm/panic: Fix expected string for QR_CODE in drm_panic_type_map Nathan Chancellor
2026-01-06 8:19 ` Tvrtko Ursulin
2026-01-06 21:34 ` Jocelyn Falempe
2026-01-09 8:55 ` [PATCH 0/2] drm/panic: Avoid crash from invalid CONFIG_DRM_PANIC_SCREEN values Tvrtko Ursulin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=76fb4c29-2c7b-4971-92d6-365b5782aec6@redhat.com \
--to=jfalempe@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=javierm@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=nathan@kernel.org \
--cc=tvrtko.ursulin@igalia.com \
--cc=tzimmermann@suse.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®