All of lore.kernel.org
 help / color / mirror / Atom feed
From: Chris Wilson <chris@chris-wilson.co.uk>
To: intel-gfx@lists.freedesktop.org
Subject: [PATCH] drm/i915: Sanity check the computed size and base of stolen memory
Date: Fri, 27 Jan 2017 17:20:08 +0000	[thread overview]
Message-ID: <20170127172008.25126-1-chris@chris-wilson.co.uk> (raw)
In-Reply-To: <20170127165531.28135-2-chris@chris-wilson.co.uk>

Just do a quick check that the stolen memory address range doesn't
overflow our chosen integer type.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 drivers/gpu/drm/i915/i915_gem_stolen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_gem_stolen.c b/drivers/gpu/drm/i915/i915_gem_stolen.c
index 42bbc4b04fd6..37a26e1c9190 100644
--- a/drivers/gpu/drm/i915/i915_gem_stolen.c
+++ b/drivers/gpu/drm/i915/i915_gem_stolen.c
@@ -189,7 +189,7 @@ static dma_addr_t i915_stolen_to_dma(struct drm_i915_private *dev_priv)
 		base = tom - tseg_size - ggtt->stolen_size;
 	}
 
-	if (base == 0)
+	if (base == 0 || base + ggtt->stolen_size <= base)
 		return 0;
 
 	/* make sure we don't clobber the GTT if it's within stolen memory */
-- 
2.11.0

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

  parent reply	other threads:[~2017-01-27 17:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-27 16:55 [PATCH 1/2] drm/i915: Treat stolen memory as DMA addresses Chris Wilson
2017-01-27 16:55 ` [PATCH 2/2] drm/i915: Check that the DMA address for stolen fits within dma_addr_t Chris Wilson
2017-01-27 17:05   ` Ville Syrjälä
2017-01-27 17:18     ` Chris Wilson
2017-01-27 17:20   ` Chris Wilson [this message]
2017-01-27 20:57     ` [PATCH] drm/i915: Sanity check the computed size and base of stolen memory Paulo Zanoni
2017-01-30 12:41     ` Joonas Lahtinen
2017-01-30 13:15       ` Chris Wilson
2017-01-30 13:45         ` Joonas Lahtinen
2017-01-30 13:47       ` [PATCH v2] " Chris Wilson
2017-01-31 10:13         ` Joonas Lahtinen
2017-01-31 16:08           ` Chris Wilson
2017-01-27 20:50 ` [PATCH 1/2] drm/i915: Treat stolen memory as DMA addresses Paulo Zanoni
2017-01-27 21:12   ` Chris Wilson
2017-01-30 21:24 ` ✗ Fi.CI.BAT: warning for series starting with [1/2] drm/i915: Treat stolen memory as DMA addresses (rev4) Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170127172008.25126-1-chris@chris-wilson.co.uk \
    --to=chris@chris-wilson.co.uk \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.