X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Flist.c;h=3e6445d69e6300176326620101c15c906d578d63;hb=b20544380e8a0a99ac092e46192b437f62008c4a;hp=fc618a5bbb82b7f458bfc8d6552c4981fa0ddcba;hpb=958e15ec44ddaee9161daf04a15d93ea79c114a0;p=lttng-tools.git

diff --git a/src/bin/lttng/commands/list.c b/src/bin/lttng/commands/list.c
index fc618a5bb..3e6445d69 100644
--- a/src/bin/lttng/commands/list.c
+++ b/src/bin/lttng/commands/list.c
@@ -104,7 +104,7 @@ static char *get_cmdline_by_pid(pid_t pid)
 	int ret;
 	FILE *fp;
 	char *cmdline = NULL;
-	char path[24];	/* Can't go bigger than /proc/65535/cmdline */
+	char path[20];	/* Can't go bigger than /proc/65535/cmdline */
 
 	snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
 	fp = fopen(path, "r");
@@ -114,6 +114,10 @@ static char *get_cmdline_by_pid(pid_t pid)
 
 	/* Caller must free() *cmdline */
 	cmdline = malloc(PATH_MAX);
+	if (!cmdline) {
+		perror("malloc cmdline");
+		goto end;
+	}
 	ret = fread(cmdline, 1, PATH_MAX, fp);
 	if (ret < 0) {
 		perror("fread proc list");
@@ -801,7 +805,7 @@ int cmd_list(int argc, const char **argv)
 			goto end;
 		}
 
-		if (opt_kernel) {
+		if (opt_kernel || opt_userspace) {
 			/* Channel listing */
 			ret = list_channels(opt_channel);
 			if (ret < 0) {