X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libringbuffer%2Fring_buffer_backend.c;h=769e24bffa0c35475aee4ddcec62b60b4b618d93;hb=7e3cfcbe9ccfef8837c42efcf5332035814415fc;hp=20d9e2d3cb81e4de7f0904b0992ae84aeb570d85;hpb=5ad63a1632792c8bc40fa5bc9f7f45f037a68032;p=lttng-ust.git

diff --git a/libringbuffer/ring_buffer_backend.c b/libringbuffer/ring_buffer_backend.c
index 20d9e2d3..769e24bf 100644
--- a/libringbuffer/ring_buffer_backend.c
+++ b/libringbuffer/ring_buffer_backend.c
@@ -8,6 +8,7 @@
 
 #define _GNU_SOURCE
 #include <urcu/arch.h>
+#include <limits.h>
 
 #include <lttng/ringbuffer-config.h>
 #include "vatomic.h"
@@ -219,8 +220,10 @@ int channel_backend_init(struct channel_backend *chanb,
 	/*
 	 * Make sure the number of subbuffers and subbuffer size are power of 2.
 	 */
-	CHAN_WARN_ON(chanb, hweight32(subbuf_size) != 1);
-	CHAN_WARN_ON(chanb, hweight32(num_subbuf) != 1);
+	if (hweight32(subbuf_size) != 1)
+		return -EINVAL;
+	if (hweight32(num_subbuf) != 1)
+		return -EINVAL;
 
 	ret = subbuffer_id_check_index(config, num_subbuf);
 	if (ret)