From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
To: lttng-dev@lists.lttng.org
Cc: jgalar@efficios.com
Subject: [PATCH lttng-tools] Fix: initialize sessions pointer to NULL
Date: Fri, 25 Oct 2019 17:56:26 -0400 [thread overview]
Message-ID: <20191025215626.19148-1-jonathan.rajotte-julien__46770.7557416119$1572040642$gmane$org@efficios.com> (raw)
lttng_list_sessions does not set the passed pointer to NULL on empty
return. This lead to deallocation of non-allocated memory (segfault).
For returns of size 0, the value of the passed argument should be
considered "undefined".
Refactor error handling a bit by removing the "error" jump. Always call
free on the sessions object.
Fixes #1205
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
---
src/bin/lttng/commands/list.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index 28166c8be..65d8ea6f5 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -1825,7 +1825,7 @@ static int list_sessions(const char *session_name)
int ret = CMD_SUCCESS;
int count, i;
unsigned int session_found = 0;
- struct lttng_session *sessions;
+ struct lttng_session *sessions = NULL;
count = lttng_list_sessions(&sessions);
DBG("Session count %d", count);
@@ -1838,7 +1838,7 @@ static int list_sessions(const char *session_name)
if (lttng_opt_mi) {
/* Mi */
if (session_name == NULL) {
- /* List all session */
+ /* List all sessions */
ret = mi_list_sessions(sessions, count);
} else {
/* Note : this return an open session element */
@@ -1846,7 +1846,7 @@ static int list_sessions(const char *session_name)
}
if (ret) {
ret = CMD_ERROR;
- goto error;
+ goto end;
}
} else {
/* Pretty print */
@@ -1893,7 +1893,7 @@ static int list_sessions(const char *session_name)
if (!session_found && session_name != NULL) {
ERR("Session '%s' not found", session_name);
ret = CMD_ERROR;
- goto error;
+ goto end;
}
if (session_name == NULL) {
@@ -1901,9 +1901,8 @@ static int list_sessions(const char *session_name)
}
}
-error:
- free(sessions);
end:
+ free(sessions);
return ret;
}
--
2.17.1
next reply other threads:[~2019-10-25 21:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-25 21:56 Jonathan Rajotte [this message]
[not found] <20191025215626.19148-1-jonathan.rajotte-julien@efficios.com>
2019-11-05 5:25 ` [PATCH lttng-tools] Fix: initialize sessions pointer to NULL Jérémie Galarneau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='20191025215626.19148-1-jonathan.rajotte-julien__46770.7557416119$1572040642$gmane$org@efficios.com' \
--to=jonathan.rajotte-julien@efficios.com \
--cc=jgalar@efficios.com \
--cc=lttng-dev@lists.lttng.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).