diff options
| -rw-r--r-- | driver/sspt/sspt.h | 6 | ||||
| -rw-r--r-- | driver/us_proc_inst.c | 10 | ||||
| -rw-r--r-- | driver/us_proc_inst.h | 2 | ||||
| -rw-r--r-- | uprobe/swap_uprobes.c | 2 | ||||
| -rw-r--r-- | uprobe/swap_uprobes.h | 2 |
5 files changed, 9 insertions, 13 deletions
diff --git a/driver/sspt/sspt.h b/driver/sspt/sspt.h index 7488b3b0..4096f4e1 100644 --- a/driver/sspt/sspt.h +++ b/driver/sspt/sspt.h @@ -94,7 +94,6 @@ static inline struct sspt_procs *get_file_probes(const inst_us_proc_t *task_inst enum US_FLAGS { US_UNREGS_PROBE, - US_NOT_RP2, US_DISARM }; @@ -109,10 +108,7 @@ static inline int unregister_usprobe_my(struct task_struct *task, struct us_ip * switch (flag) { case US_UNREGS_PROBE: - err = unregister_usprobe(task, ip, 1, 0); - break; - case US_NOT_RP2: - err = unregister_usprobe(task, ip, 1, 1); + err = unregister_usprobe(task, ip, 1); break; case US_DISARM: disarm_uprobe(&ip->jprobe.up.kp, task); diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c index d9f9153a..b1dd9a11 100644 --- a/driver/us_proc_inst.c +++ b/driver/us_proc_inst.c @@ -1008,7 +1008,7 @@ static int remove_unmap_probes(struct task_struct *task, struct sspt_procs *proc file = sspt_procs_find_file(procs, dentry); if (file) { if (vma->vm_start == start || vma->vm_end == end) { - unregister_us_file_probes(task, file, US_NOT_RP2); + unregister_us_file_probes(task, file, US_UNREGS_PROBE); file->loaded = 0; } else { unsigned long page_addr; @@ -1017,7 +1017,7 @@ static int remove_unmap_probes(struct task_struct *task, struct sspt_procs *proc for (page_addr = vma->vm_start; page_addr < vma->vm_end; page_addr += PAGE_SIZE) { page = sspt_find_page_mapped(file, page_addr); if (page) { - unregister_us_page_probe(task, page, US_NOT_RP2); + unregister_us_page_probe(task, page, US_UNREGS_PROBE); } } @@ -1076,7 +1076,7 @@ void mm_release_probe_pre_code(void) } if (procs) { - int ret = uninstall_us_proc_probes(task, procs, US_NOT_RP2); + int ret = uninstall_us_proc_probes(task, procs, US_UNREGS_PROBE); if (ret != 0) { EPRINTF ("failed to uninstall IPs (%d)!", ret); } @@ -1257,12 +1257,12 @@ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic) return 0; } -int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic, int not_rp2) +int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic) { dbi_unregister_ujprobe(&ip->jprobe, atomic); if (ip->flag_retprobe) { - dbi_unregister_uretprobe(&ip->retprobe, atomic, not_rp2); + dbi_unregister_uretprobe(&ip->retprobe, atomic); } return 0; diff --git a/driver/us_proc_inst.h b/driver/us_proc_inst.h index a6bcd21a..27d00486 100644 --- a/driver/us_proc_inst.h +++ b/driver/us_proc_inst.h @@ -92,7 +92,7 @@ extern unsigned long imi_sum_hit; extern struct list_head proc_probes_list; int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic); -int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic, int no_rp2); +int unregister_usprobe(struct task_struct *task, struct us_ip *ip, int atomic); #define user_backtrace(size) \ do { \ diff --git a/uprobe/swap_uprobes.c b/uprobe/swap_uprobes.c index 2e44ffc5..99cfbba2 100644 --- a/uprobe/swap_uprobes.c +++ b/uprobe/swap_uprobes.c @@ -897,7 +897,7 @@ int dbi_disarm_urp_inst_for_task(struct task_struct *parent, struct task_struct } EXPORT_SYMBOL_GPL(dbi_disarm_urp_inst_for_task); -void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic, int not_rp2) +void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic) { unsigned long flags; struct uretprobe_instance *ri; diff --git a/uprobe/swap_uprobes.h b/uprobe/swap_uprobes.h index 15d3d1ec..1d96dccc 100644 --- a/uprobe/swap_uprobes.h +++ b/uprobe/swap_uprobes.h @@ -87,7 +87,7 @@ int dbi_register_ujprobe(struct ujprobe *jp, int atomic); void dbi_unregister_ujprobe(struct ujprobe *jp, int atomic); int dbi_register_uretprobe(struct uretprobe *rp, int atomic); -void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic, int not_rp2); +void dbi_unregister_uretprobe(struct uretprobe *rp, int atomic); void dbi_unregister_all_uprobes(struct task_struct *task, int atomic); |