diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-24 04:59:24 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-05-24 04:59:24 +0300 |
| commit | c415b53ad00d27a0655bbe7691dc005787da4f8d (patch) | |
| tree | b1b97389ec7fe701d569907edab271d7c3b14254 /arch | |
| parent | e36ae2290fd1ff3768c3688627e442cd11d4ca1e (diff) | |
| parent | 944fad4583bc8a6d7dd80fbe39db50141da95793 (diff) | |
| download | linux-c415b53ad00d27a0655bbe7691dc005787da4f8d.tar.xz | |
Merge tag 'x86_mm_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 mm fixlet from Borislav Petkov:
- A sparse address space annotation fix
* tag 'x86_mm_for_v5.19_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/fault: Cast an argument to the proper address space in prefetch()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index d0074c6ed31a..fad8faa29d04 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -149,7 +149,7 @@ is_prefetch(struct pt_regs *regs, unsigned long error_code, unsigned long addr) unsigned char opcode; if (user_mode(regs)) { - if (get_user(opcode, instr)) + if (get_user(opcode, (unsigned char __user *) instr)) break; } else { if (get_kernel_nofault(opcode, instr)) |