Skip to content

Commit

Permalink
arm64: uaccess: Prevent speculative use of the current addr_limit
Browse files Browse the repository at this point in the history
A mispredicted conditional call to set_fs could result in the wrong
addr_limit being forwarded under speculation to a subsequent access_ok
check, potentially forming part of a spectre-v1 attack using uaccess
routines.

This patch prevents this forwarding from taking place, but putting heavy
barriers in set_fs after writing the addr_limit.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
  • Loading branch information
Will Deacon authored and Catalin Marinas committed Feb 6, 2018
1 parent 6314d90 commit c2f0ad4
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions arch/arm64/include/asm/uaccess.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,13 @@ static inline void set_fs(mm_segment_t fs)
{
current_thread_info()->addr_limit = fs;

/*
* Prevent a mispredicted conditional call to set_fs from forwarding
* the wrong address limit to access_ok under speculation.
*/
dsb(nsh);
isb();

/* On user-mode return, check fs is correct */
set_thread_flag(TIF_FSCHECK);

Expand Down

0 comments on commit c2f0ad4

Please sign in to comment.