| Message ID | 20190925043800.726-1-navid.emamdoost@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vmwgfx: prevent memory leak in vmw_cmdbuf_res_add | expand |
On Tue, Sep 24, 2019 at 11:38 PM Navid Emamdoost <navid.emamdoost@gmail.com> wrote: > > In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory > for cres should be released. > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> Would you please review this patch? Thanks, > --- > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > index 4ac55fc2bf97..44d858ce4ce7 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, > > cres->hash.key = user_key | (res_type << 24); > ret = drm_ht_insert_item(&man->resources, &cres->hash); > - if (unlikely(ret != 0)) > + if (unlikely(ret != 0)) { > + kfree(cres); > goto out_invalid_key; > + } > > cres->state = VMW_CMDBUF_RES_ADD; > cres->res = vmw_resource_reference(res); > -- > 2.17.1 >
ping ... On Thu, Nov 21, 2019 at 12:17 PM Navid Emamdoost <navid.emamdoost@gmail.com> wrote: > > On Tue, Sep 24, 2019 at 11:38 PM Navid Emamdoost > <navid.emamdoost@gmail.com> wrote: > > > > In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory > > for cres should be released. > > > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> > > Would you please review this patch? > > Thanks, > > > --- > > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > index 4ac55fc2bf97..44d858ce4ce7 100644 > > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > > @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, > > > > cres->hash.key = user_key | (res_type << 24); > > ret = drm_ht_insert_item(&man->resources, &cres->hash); > > - if (unlikely(ret != 0)) > > + if (unlikely(ret != 0)) { > > + kfree(cres); > > goto out_invalid_key; > > + } > > > > cres->state = VMW_CMDBUF_RES_ADD; > > cres->res = vmw_resource_reference(res); > > -- > > 2.17.1 > > > > > -- > Navid.
On 9/25/19 6:38 AM, Navid Emamdoost wrote: > In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory > for cres should be released. > > Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> > --- > drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > index 4ac55fc2bf97..44d858ce4ce7 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c > @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, > > cres->hash.key = user_key | (res_type << 24); > ret = drm_ht_insert_item(&man->resources, &cres->hash); > - if (unlikely(ret != 0)) > + if (unlikely(ret != 0)) { > + kfree(cres); > goto out_invalid_key; > + } > > cres->state = VMW_CMDBUF_RES_ADD; > cres->res = vmw_resource_reference(res); Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com> Will be part of next vmwgfx-next pull. Thanks, Thomas
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c index 4ac55fc2bf97..44d858ce4ce7 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c @@ -209,8 +209,10 @@ int vmw_cmdbuf_res_add(struct vmw_cmdbuf_res_manager *man, cres->hash.key = user_key | (res_type << 24); ret = drm_ht_insert_item(&man->resources, &cres->hash); - if (unlikely(ret != 0)) + if (unlikely(ret != 0)) { + kfree(cres); goto out_invalid_key; + } cres->state = VMW_CMDBUF_RES_ADD; cres->res = vmw_resource_reference(res);
In vmw_cmdbuf_res_add if drm_ht_insert_item fails the allocated memory for cres should be released. Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> --- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)