Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+9
-11
+9
-11
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
+9
-11
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c
···
1628
1628
1629
1629
static int eb_copy_relocations(const struct i915_execbuffer *eb)
1630
1630
{
1631
+
struct drm_i915_gem_relocation_entry *relocs;
1631
1632
const unsigned int count = eb->buffer_count;
1632
1633
unsigned int i;
1633
1634
int err;
···
1636
1635
for (i = 0; i < count; i++) {
1637
1636
const unsigned int nreloc = eb->exec[i].relocation_count;
1638
1637
struct drm_i915_gem_relocation_entry __user *urelocs;
1639
-
struct drm_i915_gem_relocation_entry *relocs;
1640
1638
unsigned long size;
1641
1639
unsigned long copied;
1642
1640
···
1663
1663
1664
1664
if (__copy_from_user((char *)relocs + copied,
1665
1665
(char __user *)urelocs + copied,
1666
-
len)) {
1667
-
end_user:
1668
-
user_access_end();
1669
-
end:
1670
-
kvfree(relocs);
1671
-
err = -EFAULT;
1672
-
goto err;
1673
-
}
1666
+
len))
1667
+
goto end;
1674
1668
1675
1669
copied += len;
1676
1670
} while (copied < size);
···
1693
1699
1694
1700
return 0;
1695
1701
1702
+
end_user:
1703
+
user_access_end();
1704
+
end:
1705
+
kvfree(relocs);
1706
+
err = -EFAULT;
1696
1707
err:
1697
1708
while (i--) {
1698
-
struct drm_i915_gem_relocation_entry *relocs =
1699
-
u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
1709
+
relocs = u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);
1700
1710
if (eb->exec[i].relocation_count)
1701
1711
kvfree(relocs);
1702
1712
}