[REFACTOR] rename kretprobe* --> uretprobe*

diff --git a/driver/probes.h b/driver/probes.h
index 895ad6f..2215c7d 100644 (file)
--- a/driver/probes.h
+++ b/driver/probes.h
@@ -56,7 +56,7 @@ extern struct kretprobe my_kretprobe[];
        .vtps_count=0, .p_vtps=NULL, .loaded=0}
 #define MY_UPROBE_ENTRY(_name, _entry_hand, _exit_hand) {.name = #_name, \
        .jprobe.entry = JPROBE_ENTRY(_entry_hand), \
-       .retprobe.handler = (kretprobe_handler_t)_exit_hand}
+       .retprobe.handler = (uretprobe_handler_t)_exit_hand}
 #define MY_UPROBE_ENTRY_EXT(_name, _pre_entry_hand, _entry_hand, _exit_hand) {.name = #_name, .jprobe.pre_entry = (kprobe_pre_entry_handler_t)_pre_entry_hand, .jprobe.entry = JPROBE_ENTRY(_entry_hand), .retprobe.handler = (kretprobe_handler_t)_exit_hand}
 
 #endif // __PROBES_H__

diff --git a/driver/sspt/ip.c b/driver/sspt/ip.c
index c6e59ce..cf3f31d 100644 (file)
--- a/driver/sspt/ip.c
+++ b/driver/sspt/ip.c
@@ -48,7 +48,7 @@ static inline void set_ip_jp_handler(struct us_ip *ip, kprobe_pre_entry_handler_
        ip->jprobe.entry = entry;
 }
 
-static inline void set_ip_rp_handler(struct us_ip *ip, kretprobe_handler_t handler)
+static inline void set_ip_rp_handler(struct us_ip *ip, uretprobe_handler_t handler)
 {
        ip->flag_retprobe = 1;
        ip->retprobe.handler = handler;

diff --git a/driver/sspt/ip.h b/driver/sspt/ip.h
index 510c3fc..d8da89b 100644 (file)
--- a/driver/sspt/ip.h
+++ b/driver/sspt/ip.h
@@ -26,7 +26,8 @@
  */
 
 #include <linux/list.h>
-#include "../../kprobe/dbi_kprobes.h"
+//#include "../../kprobe/dbi_kprobes.h"
+#include <swap_uprobes.h>
 
 // TODO: tmp struct ip_data
 struct ip_data {
@@ -35,7 +36,7 @@ struct ip_data {
 
        kprobe_pre_entry_handler_t pre_handler;
        unsigned long jp_handler;
-       kretprobe_handler_t rp_handler;
+       uretprobe_handler_t rp_handler;
 
        unsigned flag_retprobe:1;
 };
@@ -47,7 +48,7 @@ struct us_ip {
        struct list_head list;
 
        struct jprobe jprobe;
-       struct kretprobe retprobe;
+       struct uretprobe retprobe;
 
        unsigned long offset;
        unsigned long got_addr;

diff --git a/driver/sspt/sspt_debug.h b/driver/sspt/sspt_debug.h
index 1857568..2ebc195 100644 (file)
--- a/driver/sspt/sspt_debug.h
+++ b/driver/sspt/sspt_debug.h
@@ -31,7 +31,7 @@ static inline void print_jprobe(struct jprobe *jp)
                        (unsigned long)jp->entry, (unsigned long)jp->pre_entry);
 }
 
-static inline void print_retprobe(struct kretprobe *rp)
+static inline void print_retprobe(struct uretprobe *rp)
 {
        printk("###         RP: handler=%lx\n",
                        (unsigned long)rp->handler);

diff --git a/driver/us_proc_inst.c b/driver/us_proc_inst.c
index 541554d..6b84363 100644 (file)
--- a/driver/us_proc_inst.c
+++ b/driver/us_proc_inst.c
@@ -58,7 +58,7 @@
 
 unsigned long ujprobe_event_pre_handler (struct us_ip *ip, struct pt_regs *regs);
 void ujprobe_event_handler (unsigned long arg1, unsigned long arg2, unsigned long arg3, unsigned long arg4, unsigned long arg5, unsigned long arg6);
-int uretprobe_event_handler (struct kretprobe_instance *probe, struct pt_regs *regs, struct us_ip *ip);
+int uretprobe_event_handler(struct uretprobe_instance *probe, struct pt_regs *regs, struct us_ip *ip);
 
 
 int us_proc_probes;
@@ -299,7 +299,7 @@ static void set_mapping_file(struct sspt_file *file,
 int install_otg_ip(unsigned long addr,
                        kprobe_pre_entry_handler_t pre_handler,
                        unsigned long jp_handler,
-                       kretprobe_handler_t rp_handler)
+                       uretprobe_handler_t rp_handler)
 {
        int ret = 0;
        struct task_struct *task = current->group_leader;
@@ -1189,7 +1189,7 @@ static void send_plt(struct us_ip *ip)
        }
 }
 
-int uretprobe_event_handler(struct kretprobe_instance *probe, struct pt_regs *regs, struct us_ip *ip)
+int uretprobe_event_handler(struct uretprobe_instance *probe, struct pt_regs *regs, struct us_ip *ip)
 {
        int retval = regs_return_value(regs);
        unsigned long addr = (unsigned long)ip->jprobe.kp.addr;
@@ -1240,7 +1240,7 @@ int register_usprobe(struct task_struct *task, struct us_ip *ip, int atomic)
                // Mr_Nobody: comment for valencia
                ip->retprobe.kp.tgid = task->tgid;
                if (ip->retprobe.handler == NULL) {
-                       ip->retprobe.handler = (kretprobe_handler_t)uretprobe_event_handler;
+                       ip->retprobe.handler = (uretprobe_handler_t)uretprobe_event_handler;
                        DPRINTF("Set default ret event handler for %x\n", ip->offset);
                }
 
@@ -1351,16 +1351,16 @@ int dump_backtrace(probe_id_t probe_id, struct task_struct *task,
 }
 EXPORT_SYMBOL_GPL(dump_backtrace);
 
-struct kretprobe_instance *find_ri(struct task_struct *task, struct us_ip *ip)
+struct uretprobe_instance *find_ri(struct task_struct *task, struct us_ip *ip)
 {
        struct hlist_node *item, *tmp_node;
-       struct kretprobe_instance *ri;
+       struct uretprobe_instance *ri;
 
        if (ip == NULL)
                return NULL;
 
        hlist_for_each_safe (item, tmp_node, &ip->retprobe.used_instances) {
-               ri = hlist_entry (item, struct kretprobe_instance, uflist);
+               ri = hlist_entry(item, struct uretprobe_instance, uflist);
 
                if (ri->task && ri->task->pid == task->pid &&
                                ri->task->tgid == task->tgid)
@@ -1373,7 +1373,7 @@ EXPORT_SYMBOL_GPL(find_ri);
 
 unsigned long get_ret_addr(struct task_struct *task, struct us_ip *ip)
 {
-       struct kretprobe_instance *ri = find_ri(task, ip);;
+       struct uretprobe_instance *ri = find_ri(task, ip);;
        if (ri)
                return (unsigned long)ri->ret_addr;
        else
@@ -1383,7 +1383,7 @@ EXPORT_SYMBOL_GPL(get_ret_addr);
 
 unsigned long get_entry_sp(struct task_struct *task, struct us_ip *ip)
 {
-       struct kretprobe_instance *ri = find_ri(task, ip);
+       struct uretprobe_instance *ri = find_ri(task, ip);
        if (ri)
                return (unsigned long)ri->sp;
        else

diff --git a/driver/us_proc_inst.h b/driver/us_proc_inst.h
index a88e552..d82ebb2 100644 (file)
--- a/driver/us_proc_inst.h
+++ b/driver/us_proc_inst.h
@@ -77,8 +77,8 @@ extern int dump_to_trace(probe_id_t probe_id, void *addr, const char *buf,
 extern int dump_backtrace(probe_id_t probe_id, struct task_struct *task,
                void *addr, struct pt_regs *regs, unsigned long sz);
 
-/* Finds task's kretprobe_instance object */
-struct kretprobe_instance *find_ri(struct task_struct *task, struct us_ip *ip);
+/* Finds task's uretprobe_instance object */
+struct uretprobe_instance *find_ri(struct task_struct *task, struct us_ip *ip);
 
 /* Gets current function return address */
 extern unsigned long get_ret_addr(struct task_struct *task, struct us_ip *ip);
@@ -105,6 +105,6 @@ struct dentry *dentry_by_path(const char *path);
 int install_otg_ip(unsigned long addr,
                        kprobe_pre_entry_handler_t pre_handler,
                        unsigned long jp_handler,
-                       kretprobe_handler_t rp_handler);
+                       uretprobe_handler_t rp_handler);
 
 #endif /* !defined(__US_PROC_INST_H__) */