]> git.itanic.dy.fi Git - linux-stable/commitdiff
drm/vmwgfx: Fix nasty write past alloced memory area
authorThomas Hellstrom <thellstrom@vmware.com>
Fri, 1 Jun 2012 13:48:04 +0000 (15:48 +0200)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 10 Jun 2012 13:41:55 +0000 (14:41 +0100)
commit 0824db38e515644f8d1bfd64adbd7cb2c6ea7c62 upstream.

Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c

index f4e7763a7694478ded28ae30eada55781d3eec2c..c41226a5ba5910fe5b16e8caf60e3c3fb3d8d2be 100644 (file)
@@ -66,7 +66,7 @@ static int vmw_gmr2_bind(struct vmw_private *dev_priv,
        cmd += sizeof(remap_cmd) / sizeof(uint32);
 
        for (i = 0; i < num_pages; ++i) {
-               if (VMW_PPN_SIZE > 4)
+               if (VMW_PPN_SIZE <= 4)
                        *cmd = page_to_pfn(*pages++);
                else
                        *((uint64_t *)cmd) = page_to_pfn(*pages++);