From: Yannick Lamarre Date: Tue, 26 Mar 2019 19:53:06 +0000 (-0400) Subject: Fix: Properly sanitize input parameter X-Git-Tag: v2.12.0-rc1~627 X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=d6a6a6091a565905b7b50b9b6d8ec5b0d02f605a Fix: Properly sanitize input parameter The lttng client uses the sizeof the containing buffer, defined as LTTNG_SYMBOL_NAME_LEN, for input string sanitation instead of libc defined macro NAME_MAX. lttng-enable_channel improperly verified user input and wrongly discarded valid input in case NAME_MAX was less than the sizeof the containing buffer for the channel's name. This patch also fixes potential buffer overflow caused by an improperly bounded strcpy in the case where NAME_MAX would have been greater than LTTNG_SYMBOL_NAME_LEN. Signed-off-by: Yannick Lamarre Signed-off-by: Jérémie Galarneau --- diff --git a/src/bin/lttng/commands/enable_channels.c b/src/bin/lttng/commands/enable_channels.c index b4e2942c3..3a7f9fd06 100644 --- a/src/bin/lttng/commands/enable_channels.c +++ b/src/bin/lttng/commands/enable_channels.c @@ -244,7 +244,7 @@ static int enable_channel(char *session_name) void *extended_ptr; /* Validate channel name's length */ - if (strlen(channel_name) >= NAME_MAX) { + if (strlen(channel_name) >= sizeof(chan_opts.name)) { ERR("Channel name is too long (max. %zu characters)", sizeof(chan_opts.name) - 1); error = 1;