Commit 5e857ce6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hch' (maccess patches from Christoph Hellwig) 

Merge non-faulting memory access cleanups from Christoph Hellwig:
 "Andrew and I decided to drop the patches implementing your suggested
  rename of the probe_kernel_* and probe_user_* helpers from -mm as
  there were way to many conflicts.

  After -rc1 might be a good time for this as all the conflicts are
  resolved now"

This also adds a type safety checking patch on top of the renaming
series to make the subtle behavioral difference between 'get_user()' and
'get_kernel_nofault()' less potentially dangerous and surprising.

* emailed patches from Christoph Hellwig <hch@lst.de>:
  maccess: make get_kernel_nofault() check for minimal type compatibility
  maccess: rename probe_kernel_address to get_kernel_nofault
  maccess: rename probe_user_{read,write} to copy_{from,to}_user_nofault
  maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault
parents 670d0a4b 0c389d89

arch/arm/kernel/ftrace.c

+2 −1
Original line number Diff line number Diff line
@@ -84,7 +84,8 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, 
		old = __opcode_to_mem_arm(old);



	if (validate) {

		if (probe_kernel_read(&replaced, (void *)pc, MCOUNT_INSN_SIZE))

		if (copy_from_kernel_nofault(&replaced, (void *)pc,

				MCOUNT_INSN_SIZE))

			return -EFAULT;



		if (replaced != old)

arch/arm/kernel/kgdb.c

+1 −1
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) 
	/* patch_text() only supports int-sized breakpoints */

	BUILD_BUG_ON(sizeof(int) != BREAK_INSTR_SIZE);



	err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,

	err = copy_from_kernel_nofault(bpt->saved_instr, (char *)bpt->bpt_addr,

				BREAK_INSTR_SIZE);

	if (err)

		return err;

arch/arm/kernel/traps.c

+1 −1
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ int is_valid_bugaddr(unsigned long pc) 
	u32 insn = __opcode_to_mem_arm(BUG_INSTR_VALUE);

#endif



	if (probe_kernel_address((unsigned *)pc, bkpt))

	if (get_kernel_nofault(bkpt, (void *)pc))

		return 0;



	return bkpt == insn;

arch/arm/mm/alignment.c

+2 −2
Original line number Diff line number Diff line
@@ -774,7 +774,7 @@ static int alignment_get_arm(struct pt_regs *regs, u32 *ip, u32 *inst) 
	if (user_mode(regs))

		fault = get_user(instr, ip);

	else

		fault = probe_kernel_address(ip, instr);

		fault = get_kernel_nofault(instr, ip);



	*inst = __mem_to_opcode_arm(instr);
@@ -789,7 +789,7 @@ static int alignment_get_thumb(struct pt_regs *regs, u16 *ip, u16 *inst) 
	if (user_mode(regs))

		fault = get_user(instr, ip);

	else

		fault = probe_kernel_address(ip, instr);

		fault = get_kernel_nofault(instr, ip);



	*inst = __mem_to_opcode_thumb16(instr);

arch/arm64/kernel/insn.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ int __kprobes aarch64_insn_read(void *addr, u32 *insnp) 
	int ret;

	__le32 val;



	ret = probe_kernel_read(&val, addr, AARCH64_INSN_SIZE);

	ret = copy_from_kernel_nofault(&val, addr, AARCH64_INSN_SIZE);

	if (!ret)

		*insnp = le32_to_cpu(val);
@@ -151,7 +151,7 @@ static int __kprobes __aarch64_insn_write(void *addr, __le32 insn) 
	raw_spin_lock_irqsave(&patch_lock, flags);

	waddr = patch_map(addr, FIX_TEXT_POKE0);



	ret = probe_kernel_write(waddr, &insn, AARCH64_INSN_SIZE);

	ret = copy_to_kernel_nofault(waddr, &insn, AARCH64_INSN_SIZE);



	patch_unmap(FIX_TEXT_POKE0);

	raw_spin_unlock_irqrestore(&patch_lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE