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

Commit a40e8d31 authored by Owain Ainsworth's avatar Owain Ainsworth Committed by Eric Anholt
Browse files

drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls. 



Signed-off-by: default avatarOwain G. Ainsworth <oga@openbsd.org>
Signed-off-by: default avatarEric Anholt <eric@anholt.net>
parent aacef09b

drivers/gpu/drm/i915/i915_dma.c

+3 −1
Original line number Diff line number Diff line
@@ -735,8 +735,10 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, 
	if (cmdbuf->num_cliprects) {

		cliprects = kcalloc(cmdbuf->num_cliprects,

				    sizeof(struct drm_clip_rect), GFP_KERNEL);

		if (cliprects == NULL)

		if (cliprects == NULL) {

			ret = -ENOMEM;

			goto fail_batch_free;

		}



		ret = copy_from_user(cliprects, cmdbuf->cliprects,

				     cmdbuf->num_cliprects *

drivers/gpu/drm/i915/i915_gem.c

+3 −1
Original line number Diff line number Diff line
@@ -3688,8 +3688,10 @@ i915_gem_do_execbuffer(struct drm_device *dev, void *data, 
	if (args->num_cliprects != 0) {

		cliprects = kcalloc(args->num_cliprects, sizeof(*cliprects),

				    GFP_KERNEL);

		if (cliprects == NULL)

		if (cliprects == NULL) {

			ret = -ENOMEM;

			goto pre_mutex_err;

		}



		ret = copy_from_user(cliprects,

				     (struct drm_clip_rect __user *)