Commit 0b2c8f8b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

i915: fix missing user_access_end() in page fault exception case

When commit fddcd00a ("drm/i915: Force the slow path after a
user-write error") unified the error handling for various user access
problems, it didn't do the user_access_end() that is needed for the
unsafe_put_user() case.

It's not a huge deal: a missed user_access_end() will only mean that
SMAP protection isn't active afterwards, and for the error case we'll be
returning to user mode soon enough anyway.  But it's wrong, and adding
the proper user_access_end() is trivial enough (and doing it for the
other error cases where it isn't needed doesn't hurt).

I noticed it while doing the same prep-work for changing
user_access_begin() that precipitated the access_ok() changes in commit
96d4f267 ("Remove 'type' argument from access_ok() function").

Fixes: fddcd00a

 ("drm/i915: Force the slow path after a user-write error")
Cc: Chris Wilson <>
Cc: Joonas Lahtinen <>
Cc: # v4.20
Signed-off-by: default avatarLinus Torvalds <>
parent 4caf4ebf
......@@ -1605,6 +1605,7 @@ static int eb_copy_relocations(const struct i915_execbuffer *eb)
(char __user *)urelocs + copied,
len)) {
err = -EFAULT;
goto err;
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment