On Tue, Apr 08, 2025 at 09:32:19AM +0800, jiangf...@kylinos.cn wrote:
> From: Feng Jiang <jiangf...@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 <jiangf...@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
