From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Wed, 26 Sep 2012 02:10:06 +0000 (-0400)
Subject: Fix relayd: NULL ptr deref
X-Git-Tag: v2.1.0-rc4~3
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=438b505e46c9cafce645b6ff88a03072174184e8

Fix relayd: NULL ptr deref

Signed-off-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 15e2b2266..d01491e9c 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1267,7 +1267,7 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 {
 	int ret = htobe32(LTTNG_OK);
 	struct lttcomm_relayd_version reply;
-	struct relay_session *session = NULL;
+	struct relay_session *session;
 
 	if (cmd->session == NULL) {
 		session = zmalloc(sizeof(struct relay_session));
@@ -1279,6 +1279,8 @@ int relay_send_version(struct lttcomm_relayd_hdr *recv_hdr,
 		session->id = ++last_relay_session_id;
 		DBG("Created session %" PRIu64, session->id);
 		cmd->session = session;
+	} else {
+		session = cmd->session;
 	}
 	session->version_check_done = 1;