Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d570fd51 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: kgsl: Fix context leak in aux_command ioctl"

parents bae21357 8ed160d8

drivers/gpu/msm/kgsl.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2023,12 +2023,12 @@ long kgsl_ioctl_gpu_aux_command(struct kgsl_device_private *dev_priv, 
				goto err;

				goto err;

			}

			}





			drawobjs[index++] = DRAWOBJ(timelineobj);



			ret = kgsl_drawobj_add_timeline(dev_priv, timelineobj,

			ret = kgsl_drawobj_add_timeline(dev_priv, timelineobj,

				u64_to_user_ptr(generic.priv), generic.size);

				u64_to_user_ptr(generic.priv), generic.size);

			if (ret)

			if (ret)

				goto err;

				goto err;



			drawobjs[index++] = DRAWOBJ(timelineobj);

		} else {

		} else {

			ret = -EINVAL;

			ret = -EINVAL;

			goto err;

			goto err;

drivers/gpu/msm/kgsl_drawobj.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -900,6 +900,7 @@ int kgsl_drawobj_add_timeline(struct kgsl_device_private *dev_priv, 
		kgsl_timeline_put(timelineobj->timelines[i].timeline);

		kgsl_timeline_put(timelineobj->timelines[i].timeline);





	kvfree(timelineobj->timelines);

	kvfree(timelineobj->timelines);

	timelineobj->timelines = NULL;

	return ret;

	return ret;

}

}