From: Yannick Brosseau Date: Sat, 3 Dec 2011 02:03:19 +0000 (-0500) Subject: Fix last modifications to string_from_user operations X-Git-Tag: v2.0-pre11~10 X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=b426d8af39ec29108dc3d4b6dcb09054138b0a8c;hp=65a8ae6b080e172f6c4f47bfb8f51b42ff6aaaa7;p=lttng-modules.git Fix last modifications to string_from_user operations Signed-off-by: Yannick Brosseau Signed-off-by: Mathieu Desnoyers --- diff --git a/probes/lttng-events.h b/probes/lttng-events.h index ff6273fb..d486994f 100644 --- a/probes/lttng-events.h +++ b/probes/lttng-events.h @@ -347,7 +347,7 @@ static __used struct lttng_probe_desc TP_ID(__probe_desc___, TRACE_SYSTEM) = { #undef __string_from_user #define __string_from_user(_item, _src) \ __event_len += __dynamic_len[__dynamic_len_idx++] = \ - min_t(size_t, strlen_user(_src), 1); + max_t(size_t, strlen_user(_src), 1); #undef TP_PROTO #define TP_PROTO(args...) args @@ -557,7 +557,7 @@ __assign_##dest##_2: \ (void) __typemap.dest; \ lib_ring_buffer_align_ctx(&__ctx, ltt_alignof(__typemap.dest));\ __ustrlen = __get_dynamic_array_len(dest); \ - if (likely(__ustrlen) > 1) { \ + if (likely(__ustrlen > 1)) { \ __chan->ops->event_write_from_user(&__ctx, src, \ __ustrlen - 1); \ } \