Fix: use MT-safe strtok_r in multithreaded context

[lttng-tools.git] / src / bin / lttng-sessiond / modprobe.c

diff --git a/src/bin/lttng-sessiond/modprobe.c b/src/bin/lttng-sessiond/modprobe.c
index 75d6387c6fbe6b6c887d2117ee8c62ac6a242199..23d4536b1ad8f88c09902d7fe6c6d8269a05a519 100644 (file)
--- a/src/bin/lttng-sessiond/modprobe.c
+++ b/src/bin/lttng-sessiond/modprobe.c
@@ -71,6 +71,7 @@ struct kern_modules_param kern_modules_probes_default[] = {
        { "lttng-probe-napi" },
        { "lttng-probe-net" },
        { "lttng-probe-power" },
+       { "lttng-probe-preemptirq" },
        { "lttng-probe-printk" },
        { "lttng-probe-random" },
        { "lttng-probe-rcu" },
@@ -495,7 +496,7 @@ static int append_list_to_probes(const char *list)
 {
        char *next;
        int ret;
-       char *tmp_list, *cur_list;
+       char *tmp_list, *cur_list, *saveptr;
 
        assert(list);
 
@@ -509,7 +510,7 @@ static int append_list_to_probes(const char *list)
                size_t name_len;
                struct kern_modules_param *cur_mod;
 
-               next = strtok(cur_list, ",");
+               next = strtok_r(cur_list, ",", &saveptr);
                if (!next) {
                        break;
                }