ftrace: Fix possible use-after-free issue in ftrace_location()

[linux-2.6-block.git] / kernel / trace / ftrace.c

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index 5a01d72f66db534d9a632ee6ca1d8828c14896a9..2308c0a2fd29fe69a73900addf5d833a1c3bd9fc 100644 (file)
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -1595,12 +1595,15 @@ static struct dyn_ftrace *lookup_rec(unsigned long start, unsigned long end)
 unsigned long ftrace_location_range(unsigned long start, unsigned long end)
 {
        struct dyn_ftrace *rec;
+       unsigned long ip = 0;
 
+       rcu_read_lock();
        rec = lookup_rec(start, end);
        if (rec)
-               return rec->ip;
+               ip = rec->ip;
+       rcu_read_unlock();
 
-       return 0;
+       return ip;
 }
 
 /**
@@ -1614,25 +1617,22 @@ unsigned long ftrace_location_range(unsigned long start, unsigned long end)
  */
 unsigned long ftrace_location(unsigned long ip)
 {
-       struct dyn_ftrace *rec;
+       unsigned long loc;
        unsigned long offset;
        unsigned long size;
 
-       rec = lookup_rec(ip, ip);
-       if (!rec) {
+       loc = ftrace_location_range(ip, ip);
+       if (!loc) {
                if (!kallsyms_lookup_size_offset(ip, &size, &offset))
                        goto out;
 
                /* map sym+0 to __fentry__ */
                if (!offset)
-                       rec = lookup_rec(ip, ip + size - 1);
+                       loc = ftrace_location_range(ip, ip + size - 1);
        }
 
-       if (rec)
-               return rec->ip;
-
 out:
-       return 0;
+       return loc;
 }
 
 /**
@@ -6591,6 +6591,8 @@ static int ftrace_process_locs(struct module *mod,
        /* We should have used all pages unless we skipped some */
        if (pg_unuse) {
                WARN_ON(!skipped);
+               /* Need to synchronize with ftrace_location_range() */
+               synchronize_rcu();
                ftrace_free_pages(pg_unuse);
        }
        return ret;
@@ -6804,6 +6806,9 @@ void ftrace_release_mod(struct module *mod)
  out_unlock:
        mutex_unlock(&ftrace_lock);
 
+       /* Need to synchronize with ftrace_location_range() */
+       if (tmp_page)
+               synchronize_rcu();
        for (pg = tmp_page; pg; pg = tmp_page) {
 
                /* Needs to be called outside of ftrace_lock */
@@ -7137,6 +7142,7 @@ void ftrace_free_mem(struct module *mod, void *start_ptr, void *end_ptr)
        unsigned long start = (unsigned long)(start_ptr);
        unsigned long end = (unsigned long)(end_ptr);
        struct ftrace_page **last_pg = &ftrace_pages_start;
+       struct ftrace_page *tmp_page = NULL;
        struct ftrace_page *pg;
        struct dyn_ftrace *rec;
        struct dyn_ftrace key;
@@ -7178,12 +7184,8 @@ void ftrace_free_mem(struct module *mod, void *start_ptr, void *end_ptr)
                ftrace_update_tot_cnt--;
                if (!pg->index) {
                        *last_pg = pg->next;
-                       if (pg->records) {
-                               free_pages((unsigned long)pg->records, pg->order);
-                               ftrace_number_of_pages -= 1 << pg->order;
-                       }
-                       ftrace_number_of_groups--;
-                       kfree(pg);
+                       pg->next = tmp_page;
+                       tmp_page = pg;
                        pg = container_of(last_pg, struct ftrace_page, next);
                        if (!(*last_pg))
                                ftrace_pages = pg;
@@ -7200,6 +7202,11 @@ void ftrace_free_mem(struct module *mod, void *start_ptr, void *end_ptr)
                clear_func_from_hashes(func);
                kfree(func);
        }
+       /* Need to synchronize with ftrace_location_range() */
+       if (tmp_page) {
+               synchronize_rcu();
+               ftrace_free_pages(tmp_page);
+       }
 }
 
 void __init ftrace_free_init_mem(void)