From 2dca180db989ea7afacdf4e70cc85e4408557382 Mon Sep 17 00:00:00 2001 From: Elias Rudberg Date: Wed, 27 May 2020 01:03:46 +0200 Subject: misc: ipfix-export unformat u16 collector_port fix Use %U and unformat_udp_port instead of %u for unformat() call for u16 collector_port number in set_ipfix_exporter_command_fn() to avoid corruption of other variables which can happen if unformat() with %u is used with a 16-bit variable. This avoids crash due to corrupted fib_index value. Type: fix Signed-off-by: Elias Rudberg Change-Id: Id54273fcc458a7f9c5aa4025aa91711f160c1c1a --- src/vnet/udp/udp_format.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/vnet/udp/udp_format.c') diff --git a/src/vnet/udp/udp_format.c b/src/vnet/udp/udp_format.c index 2277e18bcdb..93e7508711b 100644 --- a/src/vnet/udp/udp_format.c +++ b/src/vnet/udp/udp_format.c @@ -82,6 +82,23 @@ format_udp_header (u8 * s, va_list * args) return s; } +uword +unformat_udp_port (unformat_input_t * input, va_list * args) +{ + u16 *result = va_arg (*args, u16 *); + int port; + + /* Numeric type. */ + if (unformat (input, "0x%x", &port) || unformat (input, "%d", &port)) + { + if (port <= 0 || port >= (1 << 16)) + return 0; + *result = port; + return 1; + } + return 0; +} + /* * fd.io coding-style-patch-verification: ON * -- cgit 1.2.3-korg