]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/vmwgfx: fix guest_memory_dirty bitfield clobbered as size
authorZack Rusin <zack.rusin@broadcom.com>
Tue, 5 May 2026 22:22:22 +0000 (18:22 -0400)
committerZack Rusin <zack.rusin@broadcom.com>
Mon, 27 Jul 2026 15:29:24 +0000 (11:29 -0400)
Two sites in vmwgfx_resource.c assign boolean literals to
res->guest_memory_size, which is an unsigned long allocation-size
field; the intended target is the adjacent res->guest_memory_dirty
bitfield.  After the assignments the field holds 0 or 1 instead of
the resource's MOB allocation size:

  - vmw_resource_release()       writes 0 (false), and
  - vmw_resource_unbind_list()   writes 1 (true).

Subsequent revalidation paths read guest_memory_size when computing
the dirty page range (vmw_bo_dirty_transfer_to_res()) and the buffer
allocation size (vmw_resource_buf_alloc()), producing zero-length
walks or wrap-around ranges that read or write past the MOB bitmap.
The dirty-tracking intent of the original code (mark the resource as
dirtied since the last sync) is also lost, since guest_memory_dirty
is never updated.

Rename both assignments to guest_memory_dirty.

Fixes: 668b206601c5 ("drm/vmwgfx: Stop using raw ttm_buffer_object's")
Cc: stable@vger.kernel.org
Assisted-by: Claude:claude-opus-4.7
Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
Reviewed-by: Ian Forbes <ian.forbes@broadcom.com>
Link: https://patch.msgid.link/20260505222728.519626-2-zack.rusin@broadcom.com
drivers/gpu/drm/vmwgfx/vmwgfx_resource.c

index 3880116969417f66a4abe02e7a75c5bf1f378f2c..e3a187a2c7a1cce6756b62d10b45e72348ae847f 100644 (file)
@@ -136,7 +136,7 @@ static void vmw_resource_release(struct kref *kref)
                        val_buf.num_shared = 0;
                        res->func->unbind(res, false, &val_buf);
                }
-               res->guest_memory_size = false;
+               res->guest_memory_dirty = false;
                vmw_resource_mob_detach(res);
                if (res->dirty)
                        res->func->dirty_free(res);
@@ -773,7 +773,7 @@ void vmw_resource_unbind_list(struct vmw_bo *vbo)
                if (!WARN_ON_ONCE(!res->func->unbind))
                        (void) res->func->unbind(res, res->res_dirty, &val_buf);
 
-               res->guest_memory_size = true;
+               res->guest_memory_dirty = true;
                res->res_dirty = false;
                vmw_resource_mob_detach(res);
        }