projects
/
lttng-modules.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix OOPS caused by reference of config pointer
[lttng-modules.git]
/
ltt-context.c
diff --git
a/ltt-context.c
b/ltt-context.c
index 6c3890c3e4a7ba46d2c6f320610a069edbf7dbcd..60ea525bb3e6c17cfae94ed7736ac9651d73bdc1 100644
(file)
--- a/
ltt-context.c
+++ b/
ltt-context.c
@@
-21,6
+21,9
@@
int lttng_find_context(struct lttng_ctx *ctx, const char *name)
unsigned int i;
for (i = 0; i < ctx->nr_fields; i++) {
unsigned int i;
for (i = 0; i < ctx->nr_fields; i++) {
+ /* Skip allocated (but non-initialized) contexts */
+ if (!ctx->fields[i].event_field.name)
+ continue;
if (!strcmp(ctx->fields[i].event_field.name, name))
return 1;
}
if (!strcmp(ctx->fields[i].event_field.name, name))
return 1;
}
@@
-28,6
+31,9
@@
int lttng_find_context(struct lttng_ctx *ctx, const char *name)
}
EXPORT_SYMBOL_GPL(lttng_find_context);
}
EXPORT_SYMBOL_GPL(lttng_find_context);
+/*
+ * Note: as we append context information, the pointer location may change.
+ */
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
{
struct lttng_ctx_field *field;
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
{
struct lttng_ctx_field *field;
@@
-57,6
+63,9
@@
struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
}
EXPORT_SYMBOL_GPL(lttng_append_context);
}
EXPORT_SYMBOL_GPL(lttng_append_context);
+/*
+ * Remove last context field.
+ */
void lttng_remove_context_field(struct lttng_ctx **ctx_p,
struct lttng_ctx_field *field)
{
void lttng_remove_context_field(struct lttng_ctx **ctx_p,
struct lttng_ctx_field *field)
{
@@
-64,6
+73,7
@@
void lttng_remove_context_field(struct lttng_ctx **ctx_p,
ctx = *ctx_p;
ctx->nr_fields--;
ctx = *ctx_p;
ctx->nr_fields--;
+ WARN_ON_ONCE(&ctx->fields[ctx->nr_fields] != field);
memset(&ctx->fields[ctx->nr_fields], 0, sizeof(struct lttng_ctx_field));
}
EXPORT_SYMBOL_GPL(lttng_remove_context_field);
memset(&ctx->fields[ctx->nr_fields], 0, sizeof(struct lttng_ctx_field));
}
EXPORT_SYMBOL_GPL(lttng_remove_context_field);
This page took
0.038695 seconds
and
4
git commands to generate.