Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab0d805c authored by Oleg Nesterov's avatar Oleg Nesterov
Browse files

uprobes: Turn copy_opcode() into copy_from_page() 



No functional changes. Rename copy_opcode() into copy_from_page() and
add the new "int len" argument to make it more more generic for the
new users.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarAnton Arapov <anton@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
parent 3c9eb54f

kernel/events/uprobes.c

+4 −4
Original line number Diff line number Diff line
@@ -187,10 +187,10 @@ bool __weak is_trap_insn(uprobe_opcode_t *insn) 
	return is_swbp_insn(insn);

}



static void copy_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t *opcode)

static void copy_from_page(struct page *page, unsigned long vaddr, void *dst, int len)

{

	void *kaddr = kmap_atomic(page);

	memcpy(opcode, kaddr + (vaddr & ~PAGE_MASK), UPROBE_SWBP_INSN_SIZE);

	memcpy(dst, kaddr + (vaddr & ~PAGE_MASK), len);

	kunmap_atomic(kaddr);

}
@@ -208,7 +208,7 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t 
	 * is a trap variant; uprobes always wins over any other (gdb)

	 * breakpoint.

	 */

	copy_opcode(page, vaddr, &old_opcode);

	copy_from_page(page, vaddr, &old_opcode, UPROBE_SWBP_INSN_SIZE);

	is_swbp = is_swbp_insn(&old_opcode);



	if (is_swbp_insn(new_opcode)) {
@@ -1472,7 +1472,7 @@ static int is_trap_at_addr(struct mm_struct *mm, unsigned long vaddr) 
	if (result < 0)

		return result;



	copy_opcode(page, vaddr, &opcode);

	copy_from_page(page, vaddr, &opcode, UPROBE_SWBP_INSN_SIZE);

	put_page(page);

 out:

	/* This needs to return true for any variant of the trap insn */