iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

riscv: fix __user annotation in traps_misaligned.c

Browse Source 
The instruction reading code can read from either user or kernel addresses
and thus the use of __user on pointers to instructions depends on which
context. Fix a few sparse warnings by using __user for user-accesses and
remove it when not.

Fixes:

arch/riscv/kernel/traps_misaligned.c:361:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:373:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:381:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:322:24: warning: incorrect type in initializer (different address spaces)
arch/riscv/kernel/traps_misaligned.c:322:24:    expected unsigned char const [noderef] __user *__gu_ptr
arch/riscv/kernel/traps_misaligned.c:322:24:    got unsigned char const [usertype] *addr
arch/riscv/kernel/traps_misaligned.c:361:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:373:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:381:21: warning: dereference of noderef expression
arch/riscv/kernel/traps_misaligned.c:332:24: warning: incorrect type in initializer (different address spaces)
arch/riscv/kernel/traps_misaligned.c:332:24:    expected unsigned char [noderef] __user *__gu_ptr
arch/riscv/kernel/traps_misaligned.c:332:24:    got unsigned char [usertype] *addr

Fixes: 7c83232161f60 ("riscv: add support for misaligned trap handling in S-mode")
Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Link: https://lore.kernel.org/r/20231123141617.259591-1-ben.dooks@codethink.co.uk
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
This commit is contained in:
Ben Dooks 2023-11-23 14:16:17 +00:00 committed by Palmer Dabbelt
parent cfbc4f81c9
commit ca0e433b41
No known key found for this signature in database
GPG Key ID: 2E1319F35FBB1889
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/riscv/kernel/traps_misaligned.c
View File

@ -319,7 +319,7 @@ static inline int get_insn(struct pt_regs *regs, ulong mepc, ulong *r_insn)
static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val) static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val)
{ {
if (user_mode(regs)) { if (user_mode(regs)) {
return __get_user(*r_val, addr); return __get_user(*r_val, (u8 __user *)addr);
} else { } else {
*r_val = *addr; *r_val = *addr;
return 0; return 0;
@ -329,7 +329,7 @@ static inline int load_u8(struct pt_regs *regs, const u8 *addr, u8 *r_val)
static inline int store_u8(struct pt_regs *regs, u8 *addr, u8 val) static inline int store_u8(struct pt_regs *regs, u8 *addr, u8 val)
{ {
if (user_mode(regs)) { if (user_mode(regs)) {
return __put_user(val, addr); return __put_user(val, (u8 __user *)addr);
} else { } else {
*addr = val; *addr = val;
return 0; return 0;
@ -343,7 +343,7 @@ static inline int store_u8(struct pt_regs *regs, u8 *addr, u8 val)
if (user_mode(regs)) { \ if (user_mode(regs)) { \
__ret = __get_user(insn, insn_addr); \ __ret = __get_user(insn, insn_addr); \
} else { \ } else { \
insn = *insn_addr; \ insn = *(__force u16 *)insn_addr; \
__ret = 0; \ __ret = 0; \
} \ } \
\ \