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

Commit 6d43743e authored by Ravi Bangoria's avatar Ravi Bangoria Committed by Steven Rostedt (VMware)
Browse files

Uprobe: Additional argument arch_uprobe to uprobe_write_opcode() 

Add addition argument 'arch_uprobe' to uprobe_write_opcode().
We need this in later set of patches.

Link: http://lkml.kernel.org/r/20180809041856.1547-3-ravi.bangoria@linux.ibm.com



Reviewed-by: default avatarSong Liu <songliubraving@fb.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Signed-off-by: default avatarRavi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
parent 38e967ae

arch/arm/probes/uprobes/core.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ bool is_swbp_insn(uprobe_opcode_t *insn) 
int set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,

	     unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr,

	return uprobe_write_opcode(auprobe, mm, vaddr,

		   __opcode_to_mem_arm(auprobe->bpinsn));

}

arch/mips/kernel/uprobes.c

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ unsigned long arch_uretprobe_hijack_return_addr( 
int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm,

	unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);

	return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);

}



void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,

include/linux/uprobes.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ extern bool is_swbp_insn(uprobe_opcode_t *insn); 
extern bool is_trap_insn(uprobe_opcode_t *insn);

extern unsigned long uprobe_get_swbp_addr(struct pt_regs *regs);

extern unsigned long uprobe_get_trap_addr(struct pt_regs *regs);

extern int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);

extern int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr, uprobe_opcode_t);

extern int uprobe_register(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

extern int uprobe_apply(struct inode *inode, loff_t offset, struct uprobe_consumer *uc, bool);

extern void uprobe_unregister(struct inode *inode, loff_t offset, struct uprobe_consumer *uc);

kernel/events/uprobes.c

+5 −4
Original line number Diff line number Diff line
@@ -299,8 +299,8 @@ static int verify_opcode(struct page *page, unsigned long vaddr, uprobe_opcode_t 
 * Called with mm->mmap_sem held for write.

 * Return 0 (success) or a negative errno.

 */

int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr,

			uprobe_opcode_t opcode)

int uprobe_write_opcode(struct arch_uprobe *auprobe, struct mm_struct *mm,

			unsigned long vaddr, uprobe_opcode_t opcode)

{

	struct page *old_page, *new_page;

	struct vm_area_struct *vma;
@@ -351,7 +351,7 @@ int uprobe_write_opcode(struct mm_struct *mm, unsigned long vaddr, 
 */

int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr, UPROBE_SWBP_INSN);

	return uprobe_write_opcode(auprobe, mm, vaddr, UPROBE_SWBP_INSN);

}



/**
@@ -366,7 +366,8 @@ int __weak set_swbp(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned 
int __weak

set_orig_insn(struct arch_uprobe *auprobe, struct mm_struct *mm, unsigned long vaddr)

{

	return uprobe_write_opcode(mm, vaddr, *(uprobe_opcode_t *)&auprobe->insn);

	return uprobe_write_opcode(auprobe, mm, vaddr,

			*(uprobe_opcode_t *)&auprobe->insn);

}



static struct uprobe *get_uprobe(struct uprobe *uprobe)