Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 371190
b: refs/heads/master
c: 3058753
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook authored and Daniel Vetter committed Mar 13, 2013
1 parent 2b37458 commit 416a3b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 647416f9eefe7699754b01b9fc82758fde83248c
refs/heads/master: 3058753583c6a641bac188011b4d777adec916c9
6 changes: 5 additions & 1 deletion trunk/drivers/gpu/drm/i915/i915_gem_execbuffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -747,7 +747,11 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec,

length = exec[i].relocation_count *
sizeof(struct drm_i915_gem_relocation_entry);
/* we may also need to update the presumed offsets */
/*
* We must check that the entire relocation array is safe
* to read, but since we may need to update the presumed
* offsets during execution, check for full write access.
*/
if (!access_ok(VERIFY_WRITE, ptr, length))
return -EFAULT;

Expand Down

0 comments on commit 416a3b0

Please sign in to comment.