diff options
| author | Owain Ainsworth <zerooa@googlemail.com> | 2010-02-09 14:25:55 +0000 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-10 15:08:00 -0800 |
| commit | a40e8d3139e9eb54bf1d29f91639a6c5e05f652e (patch) | |
| tree | b0dc8c88f3872f57c9b29d76d5f679c2eb90792f /drivers/gpu/drm/i915/i915_dma.c | |
| parent | aacef09b59e99d9e919ede74d107d5d7f3721432 (diff) | |
drm/i915: Correctly return -ENOMEM on allocation failure in cmdbuf ioctls.
Signed-off-by: Owain G. Ainsworth <oga@openbsd.org>
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_dma.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c index e660ac07f3b..2307f98349f 100644 --- a/drivers/gpu/drm/i915/i915_dma.c +++ b/drivers/gpu/drm/i915/i915_dma.c @@ -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 * |