maccess: rename probe_user_{read,write} to copy_{from,to}_user_nofault
Better describe what these functions do. Suggested-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
fe557319aa
commit
c0ee37e85e
@@ -1305,7 +1305,8 @@ void show_user_instructions(struct pt_regs *regs)
|
||||
for (i = 0; i < 8 && n; i++, n--, pc += sizeof(int)) {
|
||||
int instr;
|
||||
|
||||
if (probe_user_read(&instr, (void __user *)pc, sizeof(instr))) {
|
||||
if (copy_from_user_nofault(&instr, (void __user *)pc,
|
||||
sizeof(instr))) {
|
||||
seq_buf_printf(&s, "XXXXXXXX ");
|
||||
continue;
|
||||
}
|
||||
|
@@ -64,9 +64,9 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid,
|
||||
isync();
|
||||
|
||||
if (is_load)
|
||||
ret = probe_user_read(to, (const void __user *)from, n);
|
||||
ret = copy_from_user_nofault(to, (const void __user *)from, n);
|
||||
else
|
||||
ret = probe_user_write((void __user *)to, from, n);
|
||||
ret = copy_to_user_nofault((void __user *)to, from, n);
|
||||
|
||||
/* switch the pid first to avoid running host with unallocated pid */
|
||||
if (quadrant == 1 && pid != old_pid)
|
||||
|
@@ -15,11 +15,11 @@ int probe_user_read_inst(struct ppc_inst *inst,
|
||||
unsigned int val, suffix;
|
||||
int err;
|
||||
|
||||
err = probe_user_read(&val, nip, sizeof(val));
|
||||
err = copy_from_user_nofault(&val, nip, sizeof(val));
|
||||
if (err)
|
||||
return err;
|
||||
if (get_op(val) == OP_PREFIX) {
|
||||
err = probe_user_read(&suffix, (void __user *)nip + 4, 4);
|
||||
err = copy_from_user_nofault(&suffix, (void __user *)nip + 4, 4);
|
||||
*inst = ppc_inst_prefix(val, suffix);
|
||||
} else {
|
||||
*inst = ppc_inst(val);
|
||||
@@ -51,7 +51,7 @@ int probe_user_read_inst(struct ppc_inst *inst,
|
||||
unsigned int val;
|
||||
int err;
|
||||
|
||||
err = probe_user_read(&val, nip, sizeof(val));
|
||||
err = copy_from_user_nofault(&val, nip, sizeof(val));
|
||||
if (!err)
|
||||
*inst = ppc_inst(val);
|
||||
|
||||
|
@@ -33,7 +33,8 @@ static unsigned int user_getsp32(unsigned int sp, int is_first)
|
||||
* which means that we've done all that we can do from
|
||||
* interrupt context.
|
||||
*/
|
||||
if (probe_user_read(stack_frame, (void __user *)p, sizeof(stack_frame)))
|
||||
if (copy_from_user_nofault(stack_frame, (void __user *)p,
|
||||
sizeof(stack_frame)))
|
||||
return 0;
|
||||
|
||||
if (!is_first)
|
||||
@@ -51,7 +52,8 @@ static unsigned long user_getsp64(unsigned long sp, int is_first)
|
||||
{
|
||||
unsigned long stack_frame[3];
|
||||
|
||||
if (probe_user_read(stack_frame, (void __user *)sp, sizeof(stack_frame)))
|
||||
if (copy_from_user_nofault(stack_frame, (void __user *)sp,
|
||||
sizeof(stack_frame)))
|
||||
return 0;
|
||||
|
||||
if (!is_first)
|
||||
|
@@ -44,7 +44,7 @@ static int read_user_stack_32(unsigned int __user *ptr, unsigned int *ret)
|
||||
((unsigned long)ptr & 3))
|
||||
return -EFAULT;
|
||||
|
||||
rc = probe_user_read(ret, ptr, sizeof(*ret));
|
||||
rc = copy_from_user_nofault(ret, ptr, sizeof(*ret));
|
||||
|
||||
if (IS_ENABLED(CONFIG_PPC64) && rc)
|
||||
return read_user_stack_slow(ptr, ret, 4);
|
||||
|
@@ -50,7 +50,7 @@ static int read_user_stack_64(unsigned long __user *ptr, unsigned long *ret)
|
||||
((unsigned long)ptr & 7))
|
||||
return -EFAULT;
|
||||
|
||||
if (!probe_user_read(ret, ptr, sizeof(*ret)))
|
||||
if (!copy_from_user_nofault(ret, ptr, sizeof(*ret)))
|
||||
return 0;
|
||||
|
||||
return read_user_stack_slow(ptr, ret, 8);
|
||||
|
@@ -426,7 +426,8 @@ static __u64 power_pmu_bhrb_to(u64 addr)
|
||||
}
|
||||
|
||||
/* Userspace: need copy instruction here then translate it */
|
||||
if (probe_user_read(&instr, (unsigned int __user *)addr, sizeof(instr)))
|
||||
if (copy_from_user_nofault(&instr, (unsigned int __user *)addr,
|
||||
sizeof(instr)))
|
||||
return 0;
|
||||
|
||||
target = branch_target((struct ppc_inst *)&instr);
|
||||
|
@@ -1066,8 +1066,8 @@ int fsl_pci_mcheck_exception(struct pt_regs *regs)
|
||||
|
||||
if (is_in_pci_mem_space(addr)) {
|
||||
if (user_mode(regs))
|
||||
ret = probe_user_read(&inst, (void __user *)regs->nip,
|
||||
sizeof(inst));
|
||||
ret = copy_from_user_nofault(&inst,
|
||||
(void __user *)regs->nip, sizeof(inst));
|
||||
else
|
||||
ret = probe_kernel_address((void *)regs->nip, inst);
|
||||
|
||||
|
Reference in New Issue
Block a user