Re: [PATCH] drm/amd/display: Fix memleak in amdgpu_dm_mode_config_init

Applied. Thanks!

Alex

On Wed, Aug 26, 2020 at 9:37 AM Dinghao Liu dinghao.liu@zju.edu.cn wrote:

When amdgpu_display_modeset_create_props() fails, state and state->context should be freed to prevent memleak. It's the same when amdgpu_dm_audio_init() fails.

Signed-off-by: Dinghao Liu dinghao.liu@zju.edu.cn

drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index df9338257ae0..2476e40c67ef 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c @@ -2834,12 +2834,18 @@ static int amdgpu_dm_mode_config_init(struct amdgpu_device *adev) &dm_atomic_state_funcs);

    r = amdgpu_display_modeset_create_props(adev);

•   if (r)
  

•   if (r) {
  

•           dc_release_state(state->context);
  

•           kfree(state);
            return r;
  

•   }
  
    r = amdgpu_dm_audio_init(adev);
  

•   if (r)
  

•   if (r) {
  

•           dc_release_state(state->context);
  

•           kfree(state);
            return r;
  

•   }
  
    return 0;
  

}

2.17.1

---

amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx