maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault (fe557319) · Commits · 戴 / test

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)

+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;

+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);

+3 −2

Original line number	Diff line number	Diff line
		@@ -72,7 +72,8 @@ static int ftrace_check_current_nop(unsigned long hook)
		uint16_t olds[7];
		unsigned long hook_pos = hook - 2;

		if (probe_kernel_read((void )olds, (void )hook_pos, sizeof(nops)))
		if (copy_from_kernel_nofault((void )olds, (void )hook_pos,
		sizeof(nops)))
		return -EFAULT;

		if (memcmp((void )nops, (void )olds, sizeof(nops))) {
		@@ -97,7 +98,7 @@ static int ftrace_modify_code(unsigned long hook, unsigned long target,

		make_jbsr(target, hook, call, nolr);

		ret = probe_kernel_write((void *)hook_pos, enable ? call : nops,
		ret = copy_to_kernel_nofault((void *)hook_pos, enable ? call : nops,
		sizeof(nops));
		if (ret)
		return -EPERM;

+3 −3

Original line number	Diff line number	Diff line
		@@ -108,7 +108,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
		goto skip_check;

		/* read the text we want to modify */
		if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
		if (copy_from_kernel_nofault(replaced, (void *)ip, MCOUNT_INSN_SIZE))
		return -EFAULT;

		/* Make sure it is what we expect it to be */
		@@ -117,7 +117,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,

		skip_check:
		/* replace the text with the new text */
		if (probe_kernel_write(((void *)ip), new_code, MCOUNT_INSN_SIZE))
		if (copy_to_kernel_nofault(((void *)ip), new_code, MCOUNT_INSN_SIZE))
		return -EPERM;
		flush_icache_range(ip, ip + MCOUNT_INSN_SIZE);

		@@ -129,7 +129,7 @@ static int ftrace_make_nop_check(struct dyn_ftrace *rec, unsigned long addr)
		unsigned char __attribute__((aligned(8))) replaced[MCOUNT_INSN_SIZE];
		unsigned long ip = rec->ip;

		if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
		if (copy_from_kernel_nofault(replaced, (void *)ip, MCOUNT_INSN_SIZE))
		return -EFAULT;
		if (rec->flags & FTRACE_FL_CONVERTED) {
		struct ftrace_call_insn call_insn, tmp_call;