Fix: zero memory passed to create channel kernel ioctl

[lttng-tools.git] / src / common / kernel-ctl / kernel-ctl.c

diff --git a/src/common/kernel-ctl/kernel-ctl.c b/src/common/kernel-ctl/kernel-ctl.c
index 6cc962703e03b11d8475212c4007c12408a32645..a4c20092286568dea369b30d8dd5eeb5516ba89b 100644 (file)
--- a/src/common/kernel-ctl/kernel-ctl.c
+++ b/src/common/kernel-ctl/kernel-ctl.c
@@ -109,6 +109,7 @@ int kernctl_create_channel(int fd, struct lttng_channel_attr *chops)
 {
        struct lttng_kernel_channel channel;
 
+       memset(&channel, 0, sizeof(channel));
        if (lttng_kernel_use_old_abi) {
                struct lttng_kernel_old_channel old_channel;
 
@@ -188,6 +189,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
        }
 
        array_alloc_len = ALIGN(kmask_len.len, 8) >> 3;
+
        kmask = zmalloc(sizeof(*kmask) + array_alloc_len);
        if (!kmask) {
                ret = -1;
@@ -200,7 +202,7 @@ int kernctl_syscall_mask(int fd, char **syscall_mask, uint32_t *nr_bits)
                goto end;
        }
 
-       new_mask = realloc(syscall_mask, array_alloc_len);
+       new_mask = realloc(*syscall_mask, array_alloc_len);
        if (!new_mask) {
                ret = -1;
                goto end;
@@ -345,6 +347,12 @@ end:
        return ret;
 }
 
+int kernctl_tracer_abi_version(int fd,
+               struct lttng_kernel_tracer_abi_version *v)
+{
+       return ioctl(fd, LTTNG_KERNEL_TRACER_ABI_VERSION, v);
+}
+
 int kernctl_wait_quiescent(int fd)
 {
        return compat_ioctl_no_arg(fd, LTTNG_KERNEL_OLD_WAIT_QUIESCENT,