Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6054f4ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 829890d2 e6a9522a

drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c

+9 −11
Original line number Diff line number Diff line
@@ -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)

{

	struct drm_i915_gem_relocation_entry *relocs;

	const unsigned int count = eb->buffer_count;

	unsigned int i;

	int err;
@@ -1635,7 +1636,6 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) 
	for (i = 0; i < count; i++) {

		const unsigned int nreloc = eb->exec[i].relocation_count;

		struct drm_i915_gem_relocation_entry __user *urelocs;

		struct drm_i915_gem_relocation_entry *relocs;

		unsigned long size;

		unsigned long copied;
@@ -1663,14 +1663,8 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) 


			if (__copy_from_user((char *)relocs + copied,

					     (char __user *)urelocs + copied,

					     len)) {

end_user:

				user_access_end();

end:

				kvfree(relocs);

				err = -EFAULT;

				goto err;

			}

					     len))

				goto end;



			copied += len;

		} while (copied < size);
@@ -1699,10 +1693,14 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb) 


	return 0;



end_user:

	user_access_end();

end:

	kvfree(relocs);

	err = -EFAULT;

err:

	while (i--) {

		struct drm_i915_gem_relocation_entry *relocs =

			u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);

		relocs = u64_to_ptr(typeof(*relocs), eb->exec[i].relocs_ptr);

		if (eb->exec[i].relocation_count)

			kvfree(relocs);

	}