* [PATCH] drm: Fix the length of event_string in drm_dev_wedged_event()
@ 2025-04-08 1:32 jiangfeng
2025-04-08 6:31 ` Raag Jadav
0 siblings, 1 reply; 2+ messages in thread
From: jiangfeng @ 2025-04-08 1:32 UTC (permalink / raw)
To: maarten.lankhorst, mripard, tzimmermann, airlied, simona,
rodrigo.vivi, andrealmeid, christian.koenig, raag.jadav
Cc: dri-devel, linux-kernel, Feng Jiang
From: Feng Jiang <jiangfeng@kylinos.cn>
The format of the event_string value is `WEDGED=<method1>[,..,<methodN>]`,
so method should be appended after 'WEDGED=' rather than overwriting it.
Fixes: b7cf9f4ac1b8 ("drm: Introduce device wedged event")
Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
---
drivers/gpu/drm/drm_drv.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
index 17fc5dc708f4..58babdab9e66 100644
--- a/drivers/gpu/drm/drm_drv.c
+++ b/drivers/gpu/drm/drm_drv.c
@@ -549,7 +549,8 @@ int drm_dev_wedged_event(struct drm_device *dev, unsigned long method)
if (drm_WARN_ONCE(dev, !recovery, "invalid recovery method %u\n", opt))
break;
- len += scnprintf(event_string + len, sizeof(event_string), "%s,", recovery);
+ len += scnprintf(event_string + len,
+ sizeof(event_string) - len, "%s,", recovery);
}
if (recovery)
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] drm: Fix the length of event_string in drm_dev_wedged_event()
2025-04-08 1:32 [PATCH] drm: Fix the length of event_string in drm_dev_wedged_event() jiangfeng
@ 2025-04-08 6:31 ` Raag Jadav
0 siblings, 0 replies; 2+ messages in thread
From: Raag Jadav @ 2025-04-08 6:31 UTC (permalink / raw)
To: jiangfeng
Cc: maarten.lankhorst, mripard, tzimmermann, airlied, simona,
rodrigo.vivi, andrealmeid, christian.koenig, dri-devel,
linux-kernel
On Tue, Apr 08, 2025 at 09:32:19AM +0800, jiangfeng@kylinos.cn wrote:
> From: Feng Jiang <jiangfeng@kylinos.cn>
>
> The format of the event_string value is `WEDGED=<method1>[,..,<methodN>]`,
> so method should be appended after 'WEDGED=' rather than overwriting it.
It's already appending it, the fix is rather for the potential array
overflow. So please update this in commit message.
> Fixes: b7cf9f4ac1b8 ("drm: Introduce device wedged event")
> Signed-off-by: Feng Jiang <jiangfeng@kylinos.cn>
> ---
> drivers/gpu/drm/drm_drv.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c
> index 17fc5dc708f4..58babdab9e66 100644
> --- a/drivers/gpu/drm/drm_drv.c
> +++ b/drivers/gpu/drm/drm_drv.c
> @@ -549,7 +549,8 @@ int drm_dev_wedged_event(struct drm_device *dev, unsigned long method)
> if (drm_WARN_ONCE(dev, !recovery, "invalid recovery method %u\n", opt))
> break;
>
> - len += scnprintf(event_string + len, sizeof(event_string), "%s,", recovery);
> + len += scnprintf(event_string + len,
> + sizeof(event_string) - len, "%s,", recovery);
Now that we allow 100 characters, you can keep this as a single line.
Raag
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-04-08 6:31 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-04-08 1:32 [PATCH] drm: Fix the length of event_string in drm_dev_wedged_event() jiangfeng
2025-04-08 6:31 ` Raag Jadav
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®