X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ltt-context.c;h=8f00bb1bd0067437170efa7aaecd23df8768212e;hb=17baffe29814f2508556e498ab8c41a192e76b67;hp=ff1ba2e1a3c5d8c18c68d8d17698022711dd5296;hpb=8070f5c01e8e64ce52912dd4f27021c5d9e3dce2;p=lttng-modules.git

diff --git a/ltt-context.c b/ltt-context.c
index ff1ba2e1..8f00bb1b 100644
--- a/ltt-context.c
+++ b/ltt-context.c
@@ -4,6 +4,8 @@
  * Copyright 2011 (c) - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * LTTng trace/channel/event context management.
+ *
+ * Dual LGPL v2.1/GPL v2 license.
  */
 
 #include <linux/module.h>
@@ -28,12 +30,12 @@ struct lttng_ctx_field *lttng_append_context(struct lttng_ctx **ctx_p)
 	if (ctx->nr_fields + 1 > ctx->allocated_fields) {
 		struct lttng_ctx_field *new_fields;
 
-		ctx->allocated_fields = min_t(size_t, 1, 2 * ctx->allocated_fields);
+		ctx->allocated_fields = max_t(size_t, 1, 2 * ctx->allocated_fields);
 		new_fields = kzalloc(ctx->allocated_fields * sizeof(struct lttng_ctx_field), GFP_KERNEL);
 		if (!new_fields)
 			return NULL;
 		if (ctx->fields)
-			memcpy(new_fields, ctx->fields, ctx->nr_fields);
+			memcpy(new_fields, ctx->fields, sizeof(*ctx->fields) * ctx->nr_fields);
 		kfree(ctx->fields);
 		ctx->fields = new_fields;
 	}