diff options
| author |   Wei Yongjun <weiyongjun1@huawei.com> | 2019-07-04 10:45:34 +0000 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2019-08-05 11:43:22 +0300 |
| commit | 0584674d7fe407c2db91a009294d5ec19f7cb1d5 (patch) | |
| tree | 9d623d5fb4edf53f1b5b1961be08333671d3d80e /drivers/gpu | |
| parent | Linux 5.3-rc3 (diff) | |
| download | linux-dev-0584674d7fe407c2db91a009294d5ec19f7cb1d5.tar.xz linux-dev-0584674d7fe407c2db91a009294d5ec19f7cb1d5.zip | |
drm/i915: fix possible memory leak in intel_hdcp_auth_downstream()
'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
(cherry picked from commit de70fdd7d24cd07e51fbec420f8704d956a47949)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/display/intel_hdcp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/display/intel_hdcp.c b/drivers/gpu/drm/i915/display/intel_hdcp.c index bc3a94d491c4..27bd7276a82d 100644 --- a/drivers/gpu/drm/i915/display/intel_hdcp.c +++ b/drivers/gpu/drm/i915/display/intel_hdcp.c @@ -536,7 +536,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; } /* |