| Message ID | 20230801025309.4049813-1-zhouzongmin@kylinos.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [RESEND] drm/qxl: prevent memory leak | expand |
On Tue, 2023-08-01 at 10:53 +0800, Zongmin Zhou wrote: > The allocated memory for qdev->dumb_heads should be released > in qxl_destroy_monitors_object before qxl suspend. > otherwise,qxl_create_monitors_object will be called to > reallocate memory for qdev->dumb_heads after qxl resume, > it will cause memory leak. > > Signed-off-by: Zongmin Zhou<zhouzongmin@kylinos.cn> > --- > drivers/gpu/drm/qxl/qxl_display.c | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/drivers/gpu/drm/qxl/qxl_display.c > b/drivers/gpu/drm/qxl/qxl_display.c > index 6492a70e3c39..404b0483bb7c 100644 > --- a/drivers/gpu/drm/qxl/qxl_display.c > +++ b/drivers/gpu/drm/qxl/qxl_display.c > @@ -1229,6 +1229,9 @@ int qxl_destroy_monitors_object(struct > qxl_device *qdev) > if (!qdev->monitors_config_bo) > return 0; > > + kfree(qdev->dumb_heads); > + qdev->dumb_heads = NULL; > + > qdev->monitors_config = NULL; > qdev->ram_header->monitors_config = 0; > Friendly ping... Hello, I sent this patch a few months ago. Could you please help me review it as well and see if there are any issues? I'm looking forward to your reply. Thanks
On Tue, 01 Aug 2023 10:53:09 +0800, Zongmin Zhou wrote: > The allocated memory for qdev->dumb_heads should be released > in qxl_destroy_monitors_object before qxl suspend. > otherwise,qxl_create_monitors_object will be called to > reallocate memory for qdev->dumb_heads after qxl resume, > it will cause memory leak. > > > [...] Applied to drm/drm-misc (drm-misc-fixes). Thanks! Maxime
diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c index 6492a70e3c39..404b0483bb7c 100644 --- a/drivers/gpu/drm/qxl/qxl_display.c +++ b/drivers/gpu/drm/qxl/qxl_display.c @@ -1229,6 +1229,9 @@ int qxl_destroy_monitors_object(struct qxl_device *qdev) if (!qdev->monitors_config_bo) return 0; + kfree(qdev->dumb_heads); + qdev->dumb_heads = NULL; + qdev->monitors_config = NULL; qdev->ram_header->monitors_config = 0;
The allocated memory for qdev->dumb_heads should be released in qxl_destroy_monitors_object before qxl suspend. otherwise,qxl_create_monitors_object will be called to reallocate memory for qdev->dumb_heads after qxl resume, it will cause memory leak. Signed-off-by: Zongmin Zhou<zhouzongmin@kylinos.cn> --- drivers/gpu/drm/qxl/qxl_display.c | 3 +++ 1 file changed, 3 insertions(+)