* [PATCH] drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
[not found] <20161114111455.GA13441@mwanda>
@ 2016-11-14 11:29 ` Chris Wilson
2016-11-18 17:19 ` [Intel-gfx] " Matthew Auld
0 siblings, 1 reply; 3+ messages in thread
From: Chris Wilson @ 2016-11-14 11:29 UTC (permalink / raw)
To: intel-gfx; +Cc: Chris Wilson, Imre Deak, stable
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
---
drivers/gpu/drm/i915/i915_gem.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 888d7f79f36d..7c57ba9ed2ea 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -2383,7 +2383,7 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
page = shmem_read_mapping_page(mapping, i);
if (IS_ERR(page)) {
ret = PTR_ERR(page);
- goto err_pages;
+ goto err_sg;
}
}
if (!i ||
@@ -2417,8 +2417,9 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj)
return st;
-err_pages:
+err_sg:
sg_mark_end(sg);
+err_pages:
for_each_sgt_page(page, sgt_iter, st) {
set_page_private(page, 0);
put_page(page);
--
2.10.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
2016-11-14 11:29 ` [PATCH] drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error Chris Wilson
@ 2016-11-18 17:19 ` Matthew Auld
2016-11-18 20:52 ` Chris Wilson
0 siblings, 1 reply; 3+ messages in thread
From: Matthew Auld @ 2016-11-18 17:19 UTC (permalink / raw)
To: Chris Wilson; +Cc: Intel Graphics Development, stable
On 14 November 2016 at 11:29, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> 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
Reviewed-by: Matthew Auld <matthew.auld@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Intel-gfx] [PATCH] drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error
2016-11-18 17:19 ` [Intel-gfx] " Matthew Auld
@ 2016-11-18 20:52 ` Chris Wilson
0 siblings, 0 replies; 3+ messages in thread
From: Chris Wilson @ 2016-11-18 20:52 UTC (permalink / raw)
To: Matthew Auld; +Cc: Intel Graphics Development, stable
On Fri, Nov 18, 2016 at 05:19:58PM +0000, Matthew Auld wrote:
> On 14 November 2016 at 11:29, Chris Wilson <chris@chris-wilson.co.uk> wrote:
> > 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
> Reviewed-by: Matthew Auld <matthew.auld@intel.com>
Thanks for the review, pushed,
-Chris
--
Chris Wilson, Intel Open Source Technology Centre
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-18 20:52 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20161114111455.GA13441@mwanda>
2016-11-14 11:29 ` [PATCH] drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error Chris Wilson
2016-11-18 17:19 ` [Intel-gfx] " Matthew Auld
2016-11-18 20:52 ` Chris Wilson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).