projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: enable event error path memory corruption
[lttng-modules.git]
/
lttng-events.c
diff --git
a/lttng-events.c
b/lttng-events.c
index 879097b4a8c7af056c0f0ec57dbef4d9376e7c57..054489c7737eeef4065ba37be77eb104725db2f4 100644
(file)
--- a/
lttng-events.c
+++ b/
lttng-events.c
@@
-27,10
+27,12
@@
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/utsname.h>
#include <linux/slab.h>
#include <linux/jiffies.h>
#include <linux/utsname.h>
+#include <linux/err.h>
#include "wrapper/uuid.h"
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/random.h"
#include "wrapper/tracepoint.h"
#include "wrapper/uuid.h"
#include "wrapper/vmalloc.h" /* for wrapper_vmalloc_sync_all() */
#include "wrapper/random.h"
#include "wrapper/tracepoint.h"
+#include "lttng-kernel-version.h"
#include "lttng-events.h"
#include "lttng-tracer.h"
#include "lttng-abi-old.h"
#include "lttng-events.h"
#include "lttng-tracer.h"
#include "lttng-abi-old.h"
@@
-60,9
+62,15
@@
void _lttng_metadata_channel_hangup(struct lttng_metadata_stream *stream);
void synchronize_trace(void)
{
synchronize_sched();
void synchronize_trace(void)
{
synchronize_sched();
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0))
+#ifdef CONFIG_PREEMPT_RT_FULL
+ synchronize_rcu();
+#endif
+#else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
#ifdef CONFIG_PREEMPT_RT
synchronize_rcu();
#endif
+#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)) */
}
struct lttng_session *lttng_session_create(void)
}
struct lttng_session *lttng_session_create(void)
@@
-359,18
+367,25
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
int ret;
mutex_lock(&sessions_mutex);
int ret;
mutex_lock(&sessions_mutex);
- if (chan->free_event_id == -1U)
+ if (chan->free_event_id == -1U) {
+ ret = -EMFILE;
goto full;
goto full;
+ }
/*
* This is O(n^2) (for each event, the loop is called at event
* creation). Might require a hash if we have lots of events.
*/
/*
* This is O(n^2) (for each event, the loop is called at event
* creation). Might require a hash if we have lots of events.
*/
- list_for_each_entry(event, &chan->session->events, list)
- if (!strcmp(event->desc->name, event_param->name))
+ list_for_each_entry(event, &chan->session->events, list) {
+ if (!strcmp(event->desc->name, event_param->name)) {
+ ret = -EEXIST;
goto exist;
goto exist;
+ }
+ }
event = kmem_cache_zalloc(event_cache, GFP_KERNEL);
event = kmem_cache_zalloc(event_cache, GFP_KERNEL);
- if (!event)
+ if (!event) {
+ ret = -ENOMEM;
goto cache_error;
goto cache_error;
+ }
event->chan = chan;
event->filter = filter;
event->id = chan->free_event_id++;
event->chan = chan;
event->filter = filter;
event->id = chan->free_event_id++;
@@
-381,13
+396,17
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
switch (event_param->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
event->desc = lttng_event_get(event_param->name);
switch (event_param->instrumentation) {
case LTTNG_KERNEL_TRACEPOINT:
event->desc = lttng_event_get(event_param->name);
- if (!event->desc)
+ if (!event->desc) {
+ ret = -ENOENT;
goto register_error;
goto register_error;
+ }
ret = kabi_2635_tracepoint_probe_register(event_param->name,
event->desc->probe_callback,
event);
ret = kabi_2635_tracepoint_probe_register(event_param->name,
event->desc->probe_callback,
event);
- if (ret)
+ if (ret) {
+ ret = -EINVAL;
goto register_error;
goto register_error;
+ }
break;
case LTTNG_KERNEL_KPROBE:
ret = lttng_kprobes_register(event_param->name,
break;
case LTTNG_KERNEL_KPROBE:
ret = lttng_kprobes_register(event_param->name,
@@
-395,8
+414,10
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
event);
event_param->u.kprobe.offset,
event_param->u.kprobe.addr,
event);
- if (ret)
+ if (ret) {
+ ret = -EINVAL;
goto register_error;
goto register_error;
+ }
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
@@
-407,8
+428,10
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
/* kretprobe defines 2 events */
event_return =
kmem_cache_zalloc(event_cache, GFP_KERNEL);
/* kretprobe defines 2 events */
event_return =
kmem_cache_zalloc(event_cache, GFP_KERNEL);
- if (!event_return)
+ if (!event_return) {
+ ret = -ENOMEM;
goto register_error;
goto register_error;
+ }
event_return->chan = chan;
event_return->filter = filter;
event_return->id = chan->free_event_id++;
event_return->chan = chan;
event_return->filter = filter;
event_return->id = chan->free_event_id++;
@@
-425,6
+448,7
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
event, event_return);
if (ret) {
kmem_cache_free(event_cache, event_return);
event, event_return);
if (ret) {
kmem_cache_free(event_cache, event_return);
+ ret = -EINVAL;
goto register_error;
}
/* Take 2 refs on the module: one per event. */
goto register_error;
}
/* Take 2 refs on the module: one per event. */
@@
-434,6
+458,7
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
WARN_ON_ONCE(!ret);
ret = _lttng_event_metadata_statedump(chan->session, chan,
event_return);
WARN_ON_ONCE(!ret);
ret = _lttng_event_metadata_statedump(chan->session, chan,
event_return);
+ WARN_ON_ONCE(ret > 0);
if (ret) {
kmem_cache_free(event_cache, event_return);
module_put(event->desc->owner);
if (ret) {
kmem_cache_free(event_cache, event_return);
module_put(event->desc->owner);
@@
-447,22
+472,29
@@
struct lttng_event *lttng_event_create(struct lttng_channel *chan,
ret = lttng_ftrace_register(event_param->name,
event_param->u.ftrace.symbol_name,
event);
ret = lttng_ftrace_register(event_param->name,
event_param->u.ftrace.symbol_name,
event);
- if (ret)
+ if (ret)
{
goto register_error;
goto register_error;
+ }
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
case LTTNG_KERNEL_NOOP:
event->desc = internal_desc;
ret = try_module_get(event->desc->owner);
WARN_ON_ONCE(!ret);
break;
case LTTNG_KERNEL_NOOP:
event->desc = internal_desc;
- if (!event->desc)
+ if (!event->desc) {
+ ret = -EINVAL;
goto register_error;
goto register_error;
+ }
break;
default:
WARN_ON_ONCE(1);
break;
default:
WARN_ON_ONCE(1);
+ ret = -EINVAL;
+ goto register_error;
}
ret = _lttng_event_metadata_statedump(chan->session, chan, event);
}
ret = _lttng_event_metadata_statedump(chan->session, chan, event);
- if (ret)
+ WARN_ON_ONCE(ret > 0);
+ if (ret) {
goto statedump_error;
goto statedump_error;
+ }
list_add(&event->list, &chan->session->events);
mutex_unlock(&sessions_mutex);
return event;
list_add(&event->list, &chan->session->events);
mutex_unlock(&sessions_mutex);
return event;
@@
-475,7
+507,7
@@
cache_error:
exist:
full:
mutex_unlock(&sessions_mutex);
exist:
full:
mutex_unlock(&sessions_mutex);
- return
NULL
;
+ return
ERR_PTR(ret)
;
}
/*
}
/*
@@
-553,6
+585,8
@@
void _lttng_event_destroy(struct lttng_event *event)
* sessions_mutex), so we can do racy operations such as looking for
* remaining space left in packet and write, since mutual exclusion
* protects us from concurrent writes.
* sessions_mutex), so we can do racy operations such as looking for
* remaining space left in packet and write, since mutual exclusion
* protects us from concurrent writes.
+ * Returns the number of bytes written in the channel, 0 if no data
+ * was written and a negative value on error.
*/
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
struct channel *chan)
*/
int lttng_metadata_output_channel(struct lttng_metadata_stream *stream,
struct channel *chan)
@@
-825,7
+859,7
@@
int _lttng_event_metadata_statedump(struct lttng_session *session,
ret = lttng_metadata_printf(session,
"event {\n"
ret = lttng_metadata_printf(session,
"event {\n"
- " name =
%s
;\n"
+ " name =
\"%s\"
;\n"
" id = %u;\n"
" stream_id = %u;\n",
event->desc->name,
" id = %u;\n"
" stream_id = %u;\n",
event->desc->name,
@@
-1250,3
+1284,6
@@
module_exit(lttng_events_exit);
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
MODULE_DESCRIPTION("LTTng Events");
MODULE_LICENSE("GPL and additional rights");
MODULE_AUTHOR("Mathieu Desnoyers <mathieu.desnoyers@efficios.com>");
MODULE_DESCRIPTION("LTTng Events");
+MODULE_VERSION(__stringify(LTTNG_MODULES_MAJOR_VERSION) "."
+ __stringify(LTTNG_MODULES_MINOR_VERSION) "."
+ __stringify(LTTNG_MODULES_PATCHLEVEL_VERSION));
This page took
0.025759 seconds
and
4
git commands to generate.