summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>2016-03-10 12:04:21 +0000
committerDaniel Vetter <daniel.vetter@ffwll.ch>2016-03-10 13:47:30 +0100
commit562c5b4d898613bec97f482098e7507f52c914cb (patch)
treea41f052910819c5ae0d66ed76019d49a70e4371b
parent5488dc16fde74595a40c5d20ae52d978313f0b4e (diff)
drm: fix blob pointer checktopic/drm-misc-2016-03-10
Check properly that the allocated blob's pointer is valid. Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Cc: Daniel Stone <daniels@collabora.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Matt Roper <matthew.d.roper@intel.com> Cc: dri-devel@lists.freedesktop.org Reviewed-by: Daniel Stone <daniels@collabora.com> Fixes: 5488dc16fde7 ("drm: introduce pipe color correction properties") Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> Link: http://patchwork.freedesktop.org/patch/msgid/1457611461-9116-1-git-send-email-lionel.g.landwerlin@intel.com
-rw-r--r--drivers/gpu/drm/drm_atomic_helper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_atomic_helper.c b/drivers/gpu/drm/drm_atomic_helper.c
index 3e49a0993191..67261ca03fbf 100644
--- a/drivers/gpu/drm/drm_atomic_helper.c
+++ b/drivers/gpu/drm/drm_atomic_helper.c
@@ -2924,8 +2924,8 @@ void drm_atomic_helper_legacy_gamma_set(struct drm_crtc *crtc,
blob = drm_property_create_blob(dev,
sizeof(struct drm_color_lut) * size,
NULL);
- if (!blob) {
- ret = -ENOMEM;
+ if (IS_ERR(blob)) {
+ ret = PTR_ERR(blob);
goto fail;
}