diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2017-08-23 11:48:04 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2017-08-23 11:48:05 +0300 |
| commit | e7c50e1156b6418004187104b1135e88921efa50 (patch) | |
| tree | 2c26920ed1da68650214ab15f71b06617f3f9bed | |
| parent | d41a3c2be178783c85e05025265ab58fbb4d4ce1 (diff) | |
| parent | ffeaf9aaf97b4bdaf114d6df52f800d71918768c (diff) | |
Merge tag 'gvt-fixes-2017-08-23' of https://github.com/01org/gvt-linux into drm-intel-fixesdrm-intel-fixes-2017-08-24
gvt-fixes-2017-08-23
- Fix possible null ptr reference in error path (Fred)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20170823075352.nlo7hp3bplnb5ilx@zhen-hp.sh.intel.com
| -rw-r--r-- | drivers/gpu/drm/i915/gvt/cmd_parser.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/gvt/cmd_parser.c b/drivers/gpu/drm/i915/gvt/cmd_parser.c index 713848c36349..e556a46cd4c2 100644 --- a/drivers/gpu/drm/i915/gvt/cmd_parser.c +++ b/drivers/gpu/drm/i915/gvt/cmd_parser.c @@ -2714,7 +2714,7 @@ static int shadow_indirect_ctx(struct intel_shadow_wa_ctx *wa_ctx) unmap_src: i915_gem_object_unpin_map(obj); put_obj: - i915_gem_object_put(wa_ctx->indirect_ctx.obj); + i915_gem_object_put(obj); return ret; } |