Fix: NULL pointer dereference of THIS_MODULE with built-in modules

[lttng-modules.git] / lttng-context.c

diff --git a/lttng-context.c b/lttng-context.c
index 1121f6efd8d05066b59efdbbe08c8b1e4cb8ae21..01e95aa965f3ddc7381b8a121d376c44abe0cd59 100644 (file)
--- a/lttng-context.c
+++ b/lttng-context.c
@@ -24,9 +24,9 @@
 #include <linux/list.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
-#include "wrapper/vmalloc.h"   /* for wrapper_vmalloc_sync_all() */
-#include "lttng-events.h"
-#include "lttng-tracer.h"
+#include <wrapper/vmalloc.h>   /* for wrapper_vmalloc_sync_all() */
+#include <lttng-events.h>
+#include <lttng-tracer.h>
 
 /*
  * The filter implementation requires that two consecutive "get" for the
@@ -282,18 +282,14 @@ int lttng_context_init(void)
        if (ret) {
                printk(KERN_WARNING "Cannot add context lttng_add_need_reschedule_to_ctx");
        }
-#if defined(CONFIG_PREEMPT_RT_FULL) || defined(CONFIG_PREEMPT)
        ret = lttng_add_preemptible_to_ctx(&lttng_static_ctx);
-       if (ret != -ENOSYS) {
+       if (ret && ret != -ENOSYS) {
                printk(KERN_WARNING "Cannot add context lttng_add_preemptible_to_ctx");
        }
-#endif
-#ifdef CONFIG_PREEMPT_RT_FULL
        ret = lttng_add_migratable_to_ctx(&lttng_static_ctx);
-       if (ret != -ENOSYS) {
+       if (ret && ret != -ENOSYS) {
                printk(KERN_WARNING "Cannot add context lttng_add_migratable_to_ctx");
        }
-#endif
        /* TODO: perf counters for filtering */
        return 0;
 }