i915: cast before shifting in i915_pte_count
authorAlan <gnomes@lxorguk.ukuu.org.uk>
Wed, 17 Feb 2016 14:20:46 +0000 (14:20 +0000)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 17 Feb 2016 16:00:38 +0000 (17:00 +0100)
Otherwise a pde_shift big enough to overflow a u32 will be truncated before
assignment

Note: We never asked for ranges spanning a 4G boundary, so this issue
doesn't cause a real problem.

Signed-off-by: Alan Cox <alan@linux.intel.com>
[danvet: Add note why this isn't a real problem.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/20160217142043.4947.60447.stgit@localhost.localdomain
drivers/gpu/drm/i915/i915_gem_gtt.h

index 66a6da2396a2c1a13f193a8d21038a1a93f454a0..368d111aa9c543fd4a9d5bc6ad4473d4538922aa 100644 (file)
@@ -418,7 +418,7 @@ static inline uint32_t i915_pte_index(uint64_t address, uint32_t pde_shift)
 static inline uint32_t i915_pte_count(uint64_t addr, size_t length,
                                      uint32_t pde_shift)
 {
-       const uint64_t mask = ~((1 << pde_shift) - 1);
+       const uint64_t mask = ~((1ULL << pde_shift) - 1);
        uint64_t end;
 
        WARN_ON(length == 0);