OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull objtool warning fix from Thomas Gleixner:
 "The recent objtool fixes/enhancements unearthed a unbalanced CLAC in
  the i915 driver.

  Chris asked me to pick the fix up and route it through"

* 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  drm/i915: Remove redundant user_access_end() from __copy_from_user() error path
This commit is contained in:
Linus Torvalds 2019-08-10 15:44:09 -07:00
parent 829890d266 e6a9522ac3
commit 6054f4ecdc
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
View File

@ -1628,6 +1628,7 @@ static int check_relocations(const struct drm_i915_gem_exec_object2 *entry)
static int eb_copy_relocations(const struct i915_execbuffer *eb) static int eb_copy_relocations(const struct i915_execbuffer *eb)
{ {
struct drm_i915_gem_relocation_entry *relocs;
const unsigned int count = eb->buffer_count; const unsigned int count = eb->buffer_count;
unsigned int i; unsigned int i;
int err; int err;
@ -1635,7 +1636,6 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
const unsigned int nreloc = eb->exec[i].relocation_count; const unsigned int nreloc = eb->exec[i].relocation_count;
struct drm_i915_gem_relocation_entry __user *urelocs; struct drm_i915_gem_relocation_entry __user *urelocs;
struct drm_i915_gem_relocation_entry *relocs;
unsigned long size; unsigned long size;
unsigned long copied; unsigned long copied;
@ -1663,14 +1663,8 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
if (__copy_from_user((char *)relocs + copied, if (__copy_from_user((char *)relocs + copied,
(char __user *)urelocs + copied, (char __user *)urelocs + copied,
len)) { len))
end_user: goto end;
user_access_end();
end:
kvfree(relocs);
err = -EFAULT;
goto err;
}
copied += len; copied += len;
} while (copied < size); } while (copied < size);
@ -1699,10 +1693,14 @@ end:
return 0; return 0;
end_user:
user_access_end();
end:
kvfree(relocs);
err = -EFAULT;
err: err:
while (i--) { while (i--) {
struct drm_i915_gem_relocation_entry *relocs = relocs = u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
if (eb->exec[i].relocation_count) if (eb->exec[i].relocation_count)
kvfree(relocs); kvfree(relocs);
} }