picofix

[kernel/swap-modules.git] / kprobe / dbi_kprobes_deps.c

diff --git a/kprobe/dbi_kprobes_deps.c b/kprobe/dbi_kprobes_deps.c
index d3c1f96..704720f 100644 (file)
--- a/kprobe/dbi_kprobes_deps.c
+++ b/kprobe/dbi_kprobes_deps.c
@@ -34,12 +34,13 @@
 #include "dbi_kdebug.h"
 
 
+#include <linux/slab.h>
+
 unsigned int *sched_addr;
 unsigned int *fork_addr;
 
 
 #define GUP_FLAGS_WRITE                  0x1
-#define GUP_FLAGS_WRITE                  0x1
 #define GUP_FLAGS_FORCE                  0x2
 #define GUP_FLAGS_IGNORE_VMA_PERMISSIONS 0x4
 #define GUP_FLAGS_IGNORE_SIGKILL         0x8
@@ -51,8 +52,10 @@ struct mm_struct init_mm;
 
 
 DECLARE_MOD_CB_DEP(kallsyms_search, unsigned long, const char *name);
-
 DECLARE_MOD_FUNC_DEP(access_process_vm, int, struct task_struct * tsk, unsigned long addr, void *buf, int len, int write);
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32)
+DECLARE_MOD_FUNC_DEP(copy_to_user_page, void, struct vm_area_struct *vma, struct page *page, unsigned long uaddr, void *dst, const void *src, unsigned long len);
+#endif
 
 DECLARE_MOD_FUNC_DEP(find_extend_vma, struct vm_area_struct *, struct mm_struct * mm, unsigned long addr);
 
@@ -65,7 +68,16 @@ DECLARE_MOD_FUNC_DEP(handle_mm_fault, int, struct mm_struct *mm, struct vm_area_
 #endif /* LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 30) */
 
 DECLARE_MOD_FUNC_DEP(get_gate_vma, struct vm_area_struct *, struct task_struct *tsk);
+
+#ifdef CONFIG_HUGETLB_PAGE
+DECLARE_MOD_FUNC_DEP(follow_hugetlb_page, int, struct mm_struct *mm, struct vm_area_struct *vma, struct page **pages, struct vm_area_struct **vmas, unsigned long *position, int *length, int i, int write);
+#endif
+
+#ifdef __HAVE_ARCH_GATE_AREA
+DECLARE_MOD_FUNC_DEP(in_gate_area, int, struct task_struct *tsk,unsigned long addr);
+#else
 DECLARE_MOD_FUNC_DEP(in_gate_area_no_task, int, unsigned long addr);
+#endif
 DECLARE_MOD_FUNC_DEP(follow_page, \
                struct page *, struct vm_area_struct * vma, \
                unsigned long address, unsigned int foll_flags);
@@ -111,14 +123,25 @@ IMP_MOD_DEP_WRAPPER (handle_mm_fault, mm, vma, address, flags)
                        struct vm_area_struct *, struct task_struct *tsk)
 IMP_MOD_DEP_WRAPPER (get_gate_vma, tsk)
 
+#ifdef CONFIG_HUGETLB_PAGE
+       DECLARE_MOD_DEP_WRAPPER (follow_hugetlb_page, int, struct mm_struct *mm, struct vm_area_struct *vma, struct page **pages, struct vm_area_struct **vmas, unsigned long *position, int *length, int i, int write)
+       IMP_MOD_DEP_WRAPPER (follow_hugetlb_page, mm, vma, pages, vmas, position, length, i, write)
+#endif
+
+#ifdef __HAVE_ARCH_GATE_AREA
+       DECLARE_MOD_DEP_WRAPPER (in_gate_area, int, struct task_struct *tsk, unsigned long addr)
+       IMP_MOD_DEP_WRAPPER (in_gate_area, tsk, addr)
+#else
        DECLARE_MOD_DEP_WRAPPER (in_gate_area_no_task, int, unsigned long addr)
 IMP_MOD_DEP_WRAPPER (in_gate_area_no_task, addr)
+#endif
 
+#if (LINUX_VERSION_CODE != KERNEL_VERSION(2, 6, 11))
        DECLARE_MOD_DEP_WRAPPER (follow_page, \
                        struct page *, struct vm_area_struct * vma, \
                        unsigned long address, unsigned int foll_flags)
 IMP_MOD_DEP_WRAPPER (follow_page, vma, address, foll_flags)
-
+#endif
        DECLARE_MOD_DEP_WRAPPER (__flush_anon_page, \
                        void, struct vm_area_struct *vma, \
                        struct page *page, unsigned long vmaddr)
@@ -134,6 +157,12 @@ IMP_MOD_DEP_WRAPPER (vm_normal_page, vma, addr, pte)
                        unsigned long uaddr, void *kaddr, unsigned long len, int write)
 IMP_MOD_DEP_WRAPPER (flush_ptrace_access, vma, page, uaddr, kaddr, len, write)
 
+#if LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32)
+       DECLARE_MOD_DEP_WRAPPER(copy_to_user_page, void, struct vm_area_struct *vma, struct page *page, unsigned long uaddr, void *dst, const void *src, unsigned long len)
+IMP_MOD_DEP_WRAPPER (copy_to_user_page, vma, page, uaddr, dst, src, len)
+#endif
+
+
 int init_module_dependencies()
 {
 
@@ -149,8 +178,18 @@ int init_module_dependencies()
        INIT_MOD_DEP_VAR(flush_ptrace_access, flush_ptrace_access);
        INIT_MOD_DEP_VAR(find_extend_vma, find_extend_vma);
        INIT_MOD_DEP_VAR(get_gate_vma, get_gate_vma);
+
+#ifdef CONFIG_HUGETLB_PAGE
+       INIT_MOD_DEP_VAR(follow_hugetlb_page, follow_hugetlb_page);
+#endif
+
+#ifdef __HAVE_ARCH_GATE_AREA
+       INIT_MOD_DEP_VAR(in_gate_area, in_gate_area);
+#else
        INIT_MOD_DEP_VAR(in_gate_area_no_task, in_gate_area_no_task);
+#endif
        INIT_MOD_DEP_VAR(follow_page, follow_page);
+
        INIT_MOD_DEP_VAR(__flush_anon_page, __flush_anon_page);
        INIT_MOD_DEP_VAR(vm_normal_page, vm_normal_page);
        INIT_MOD_DEP_VAR(access_process_vm, access_process_vm);
@@ -165,6 +204,11 @@ int init_module_dependencies()
        INIT_MOD_DEP_VAR(put_task_struct, __put_task_struct_cb);
 #endif
 
+
+#if (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32))
+       INIT_MOD_DEP_VAR(copy_to_user_page, copy_to_user_page);
+#endif
+
        return 0;
 }
 
@@ -411,17 +455,21 @@ int get_user_pages_uprobe(struct task_struct *tsk, struct mm_struct *mm,
 #endif
 }
 
+
 int access_process_vm_atomic(struct task_struct *tsk, unsigned long addr, void *buf, int len, int write)
 {
        struct mm_struct *mm;
        struct vm_area_struct *vma;
        void *old_buf = buf;
+       unsigned long addr1 = addr;
+       unsigned int* inst_buf = (unsigned int*)old_buf;
+
 
        mm = get_task_mm(tsk);
        if (!mm)
                return 0;
 
-       //down_read(&mm->mmap_sem);
+       down_read(&mm->mmap_sem);
        /* ignore errors, just check how much was successfully transferred */
        while (len) {
                int bytes, ret, offset;
@@ -430,6 +478,7 @@ int access_process_vm_atomic(struct task_struct *tsk, unsigned long addr, void *
 
                ret = get_user_pages_uprobe(tsk, mm, addr, 1,
                                write, 1, &page, &vma);
+
                if (ret <= 0) {
                        /*
                         * Check if this is a VM_IO | VM_PFNMAP VMA, which
@@ -468,7 +517,7 @@ int access_process_vm_atomic(struct task_struct *tsk, unsigned long addr, void *
                buf += bytes;
                addr += bytes;
        }
-       //up_read(&mm->mmap_sem);
+       up_read(&mm->mmap_sem);
        mmput(mm);
 
        return buf - old_buf;