]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()
authorWei Yongjun <weiyongjun1@huawei.com>
Thu, 4 Jul 2019 10:45:34 +0000 (10:45 +0000)
committerJani Nikula <jani.nikula@intel.com>
Thu, 1 Aug 2019 10:08:34 +0000 (13:08 +0300)
'ksv_fifo' is malloced in intel_hdcp_auth_downstream() and should be
freed before leaving from the error handling cases, otherwise it will
cause memory leak.

Fixes: f26ae6a652f2 ("drm/i915: SRM revocation check for HDCP1.4 and 2.2")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190704104534.12508-1-weiyongjun1@huawei.com
drivers/gpu/drm/i915/display/intel_hdcp.c

index a78139f9e847630f906e266067f9b5d3975459e3..1ffc1e61c2bece610ef843915c60b72f28bccaf7 100644 (file)
@@ -540,7 +540,8 @@ int intel_hdcp_auth_downstream(struct intel_connector *connector)
 
        if (drm_hdcp_check_ksvs_revoked(dev, ksv_fifo, num_downstream)) {
                DRM_ERROR("Revoked Ksv(s) in ksv_fifo\n");
-               return -EPERM;
+               ret = -EPERM;
+               goto err;
        }
 
        /*