Fix: memcpy of string is larger than source

[lttng-ust.git] / liblttng-ust-ctl / ustctl.c

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 5a025f2a682fd3b1c89a7b9bdf4cd69d5de28496..cf7cf87a60d56f00d39bff9a0f8c6ceeb8eba629 100644 (file)
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -2,19 +2,18 @@
  * Copyright (C) 2011 - Julien Desfossez <julien.desfossez@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License only.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -683,7 +682,7 @@ void ustctl_unmap_channel(struct lttng_ust_shm_handle *handle)
 struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_handle *handle,
        int cpu)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
        int *shm_fd, *wait_fd;
        uint64_t *memory_map_size;
        struct lttng_ust_lib_ring_buffer *buf;
@@ -692,6 +691,7 @@ struct lttng_ust_lib_ring_buffer *ustctl_open_stream_read(struct lttng_ust_shm_h
        if (!handle)
                return NULL;
 
+       chan = handle->shadow_chan;
        buf = channel_get_ring_buffer(&chan->backend.config,
                chan, cpu, handle, &shm_fd, &wait_fd, &memory_map_size);
        if (!buf)
@@ -735,11 +735,12 @@ int ustctl_get_mmap_len(struct lttng_ust_shm_handle *handle,
                unsigned long *len)
 {
        unsigned long mmap_buf_len;
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        if (chan->backend.config.output != RING_BUFFER_MMAP)
                return -EINVAL;
        mmap_buf_len = chan->backend.buf_size;
@@ -756,11 +757,12 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf,
                unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = chan->backend.subbuf_size;
        return 0;
 }
@@ -774,12 +776,13 @@ int ustctl_get_max_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *off)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
        unsigned long sb_bindex;
 
        if (!handle || !buf || !off)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        if (chan->backend.config.output != RING_BUFFER_MMAP)
                return -EINVAL;
        sb_bindex = subbuffer_id_get_index(&chan->backend.config,
@@ -792,11 +795,12 @@ int ustctl_get_mmap_read_offset(struct lttng_ust_shm_handle *handle,
 int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
                handle);
        return 0;
@@ -806,11 +810,12 @@ int ustctl_get_subbuf_size(struct lttng_ust_shm_handle *handle,
 int ustctl_get_padded_subbuf_size(struct lttng_ust_shm_handle *handle,
                struct lttng_ust_lib_ring_buffer *buf, unsigned long *len)
 {
-       struct channel *chan = handle->shadow_chan;
+       struct channel *chan;
 
        if (!handle || !buf || !len)
                return -EINVAL;
 
+       chan = handle->shadow_chan;
        *len = lib_ring_buffer_get_read_data_size(&chan->backend.config, buf,
                handle);
        *len = PAGE_ALIGN(*len);