OSDN Git Service

drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
authorChris Wilson <chris@chris-wilson.co.uk>
Mon, 14 Nov 2016 11:29:30 +0000 (11:29 +0000)
committerJani Nikula <jani.nikula@intel.com>
Wed, 30 Nov 2016 10:07:05 +0000 (12:07 +0200)
commit2420489bcb8910188578acc0c11c75445c2e4b92
tree007bd1e077a9ccf0d51d5063bbb31e2ceda4107d
parente5517c2a5a49ed5e99047008629f1cd60246ea0e
drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error

On the DMA mapping error path, sg may be NULL (it has already been
marked as the last scatterlist entry), and we should avoid dereferencing
it again.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Fixes: e227330223a7 ("drm/i915: avoid leaking DMA mappings")
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Cc: stable@vger.kernel.org
Link: http://patchwork.freedesktop.org/patch/msgid/20161114112930.2033-1-chris@chris-wilson.co.uk
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
(cherry picked from commit b17993b7b29612369270567643bcff814f4b3d7f)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/i915_gem.c