From mboxrd@z Thu Jan  1 00:00:00 1970
From: pierre-marc.fournier@polymtl.ca (Pierre-Marc Fournier)
Date: Fri, 20 Aug 2010 00:03:04 -0400
Subject: [ltt-dev] [PATCH UST] UST strncpy assert fix
In-Reply-To: <20100817222321.GB4641@Krystal>
References: <20100817222321.GB4641@Krystal>
Message-ID: <4C6DFE78.6040808@polymtl.ca>

Merged

On 08/17/2010 06:23 PM, Mathieu Desnoyers wrote:
> fix off by one in strncpy and write asserts(). Shows only when the event
> reserved fits the exact end of buffer.
>
> Signed-off-by: Mathieu Desnoyers<mathieu.desnoyers at efficios.com>
> ---
>   libust/buffers.h |    6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
>
> Index: ust/libust/buffers.h
> ===================================================================
> --- ust.orig/libust/buffers.h	2010-08-17 18:14:30.000000000 -0400
> +++ ust/libust/buffers.h	2010-08-17 18:15:25.000000000 -0400
> @@ -522,7 +522,8 @@ static __inline__ int ust_buffers_write(
>   	size_t buf_offset = BUFFER_OFFSET(offset, buf->chan);
>
>   	assert(buf_offset<  buf->chan->subbuf_size*buf->chan->subbuf_cnt);
> -	assert(buf_offset + len<  buf->chan->subbuf_size*buf->chan->subbuf_cnt);
> +	assert(buf_offset + len
> +	<= buf->chan->subbuf_size*buf->chan->subbuf_cnt);
>
>   	ust_buffers_do_copy(buf->buf_data + buf_offset, src, len);
>
> @@ -590,7 +591,8 @@ int ust_buffers_strncpy(struct ust_buffe
>   	int terminated;
>
>   	assert(buf_offset<  buf->chan->subbuf_size*buf->chan->subbuf_cnt);
> -	assert(buf_offset + len<  buf->chan->subbuf_size*buf->chan->subbuf_cnt);
> +	assert(buf_offset + len
> +	<= buf->chan->subbuf_size*buf->chan->subbuf_cnt);
>
>   	copied = ust_buffers_do_strncpy(buf->buf_data + buf_offset,
>   				        src, len,&terminated);
>