Fix: memcpy of string is larger than source

[lttng-ust.git] / liblttng-ust / ltt-probes.c

diff --git a/liblttng-ust/ltt-probes.c b/liblttng-ust/ltt-probes.c
index b24cab13f37bcaa8647193e3d3ec0980c8da3b09..15c83873f6ad25ab038b638b5ff2ec8243f2f793 100644 (file)
--- a/liblttng-ust/ltt-probes.c
+++ b/liblttng-ust/ltt-probes.c
@@ -1,11 +1,23 @@
 /*
  * ltt-probes.c
  *
- * Copyright 2010 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
  * Holds LTTng probes registry.
  *
- * Dual LGPL v2.1/GPL v2 license.
+ * Copyright 2010-2012 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; only
+ * version 2.1 of the License.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <string.h>
@@ -14,6 +26,7 @@
 #include <urcu/hlist.h>
 #include <lttng/ust-events.h>
 #include <lttng/tracepoint.h>
+#include "tracepoint-internal.h"
 #include <assert.h>
 #include <helper.h>
 #include <ctype.h>
@@ -98,7 +111,12 @@ desc_added:
         * fix the events awaiting probe load.
         */
        for (i = 0; i < desc->nr_events; i++) {
-               ret = pending_probe_fix_events(desc->event_desc[i]);
+               const struct lttng_event_desc *ed;
+
+               ed = desc->event_desc[i];
+               DBG("Registered event probe \"%s\" with signature \"%s\"",
+                       ed->name, ed->signature);
+               ret = pending_probe_fix_events(ed);
                assert(!ret);
        }
 end:
@@ -236,9 +254,10 @@ void ltt_probes_create_wildcard_events(struct wildcard_entry *entry,
 
                                memcpy(&event_param, &wildcard->event_param,
                                                sizeof(event_param));
-                               memcpy(event_param.name,
+                               strncpy(event_param.name,
                                        event_desc->name,
                                        sizeof(event_param.name));
+                               event_param.name[sizeof(event_param.name) - 1] = '\0';
                                /* create event */
                                ret = ltt_event_create(wildcard->chan,
                                        &event_param, NULL,