summaryrefslogtreecommitdiffstats
path: root/src/vnet/udp
diff options
context:
space:
mode:
authorElias Rudberg <elias.rudberg@bahnhof.net>2020-05-27 01:03:46 +0200
committerPaul Vinciguerra <pvinci@vinciconsulting.com>2020-05-29 12:57:20 +0000
commit2dca180db989ea7afacdf4e70cc85e4408557382 (patch)
tree4c39820ba7626f5009f72bd8b035dc49c575dfb4 /src/vnet/udp
parentaeb18d37b4874c18ec0a64d1cd1c597707a67edc (diff)
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 <elias.rudberg@bahnhof.net> Change-Id: Id54273fcc458a7f9c5aa4025aa91711f160c1c1a
Diffstat (limited to 'src/vnet/udp')
-rw-r--r--src/vnet/udp/udp.h1
-rw-r--r--src/vnet/udp/udp_format.c17
2 files changed, 18 insertions, 0 deletions
diff --git a/src/vnet/udp/udp.h b/src/vnet/udp/udp.h
index 0cb085b1d72..95fbcd977ef 100644
--- a/src/vnet/udp/udp.h
+++ b/src/vnet/udp/udp.h
@@ -281,6 +281,7 @@ format_function_t format_udp_header;
format_function_t format_udp_rx_trace;
format_function_t format_udp_connection;
unformat_function_t unformat_udp_header;
+unformat_function_t unformat_udp_port;
void udp_add_dst_port (udp_main_t * um, udp_dst_port_t dst_port,
char *dst_port_name, u8 is_ip4);
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
*