]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm: fix blob pointer check
authorLionel Landwerlin <lionel.g.landwerlin@intel.com>
Thu, 10 Mar 2016 12:04:21 +0000 (12:04 +0000)
committerKamal Mostafa <kamal@canonical.com>
Wed, 13 Jul 2016 15:59:33 +0000 (08:59 -0700)
BugLink: http://bugs.launchpad.net/bugs/1599109
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
(cherry picked from commit 562c5b4d898613bec97f482098e7507f52c914cb)
Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
Acked-by: Tim Gardner <tim.gardner@canonical.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
drivers/gpu/drm/drm_atomic_helper.c

index e9301685530a8186bf67b86c6f115e9c5fe85e08..f4748eb5b0a17f46016756910792cdb12b14b179 100644 (file)
@@ -2823,8 +2823,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;
        }