From: David Goulet <dgoulet@efficios.com>
Date: Mon, 22 Sep 2014 15:03:24 +0000 (-0400)
Subject: Fix: kernel context memory leak on error
X-Git-Tag: v2.6.0-rc1~50
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=fc7324e801c73fed022757ea47b0b245a5a527f7

Fix: kernel context memory leak on error

Fixes Coverity issue 1223776.

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-sessiond/context.c b/src/bin/lttng-sessiond/context.c
index 10352d026..2cc6a30a8 100644
--- a/src/bin/lttng-sessiond/context.c
+++ b/src/bin/lttng-sessiond/context.c
@@ -198,7 +198,8 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 		kctx->ctx.ctx = LTTNG_KERNEL_CONTEXT_PERF_CPU_COUNTER;
 		break;
 	default:
-		return LTTNG_ERR_KERN_CONTEXT_FAIL;
+		ret = LTTNG_ERR_KERN_CONTEXT_FAIL;
+		goto error;
 	}
 
 	kctx->ctx.u.perf_counter.type = ctx->u.perf_counter.type;
@@ -226,9 +227,12 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
 		}
 	}
 
-	ret = LTTNG_OK;
+	return LTTNG_OK;
 
 error:
+	if (kctx) {
+		trace_kernel_destroy_context(kctx);
+	}
 	return ret;
 }