Commit 29cd13cf authored Oct 21, 2019 by Navid Emamdoost Committed by Daniel Vetter Oct 23, 2019

drm/v3d: Fix memory leak in v3d_submit_cl_ioctl

In the impelementation of v3d_submit_cl_ioctl() there are two memory
leaks. One is when allocation for bin fails, and the other is when bin
initialization fails. If kcalloc fails to allocate memory for bin then
render->base should be put. Also, if v3d_job_init() fails to initialize
bin->base then allocated memory for bin should be released.

Fixes: a783a09e ("drm/v3d: Refactor job management.")
Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20191021185250.26130-1-navid.emamdoost@gmail.com

parent 4cad2a57

drivers/gpu/drm/v3d/v3d_gem.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -557,13 +557,16 @@ v3d_submit_cl_ioctl(struct drm_device dev, void data,

		if (args->bcl_start != args->bcl_end) {
		bin = kcalloc(1, sizeof(*bin), GFP_KERNEL);
		if (!bin)
		if (!bin) {
		v3d_job_put(&render->base);
		return -ENOMEM;
		}

		ret = v3d_job_init(v3d, file_priv, &bin->base,
		v3d_job_free, args->in_sync_bcl);
		if (ret) {
		v3d_job_put(&render->base);
		kfree(bin);
		return ret;
		}