From 7866907377d938867303a686533b9505be127274 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Tue, 26 Aug 2014 18:34:52 +0200 Subject: [PATCH] odp-util: Only add recirc_id mask to Netlink message if mask is provided Current unconditional call may result in NULL being passed to nl_msg_put_u32(). Cc: Andy Zhou Signed-off-by: Thomas Graf Signed-off-by: Ben Pfaff --- lib/odp-util.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/odp-util.c b/lib/odp-util.c index 19d062770..8a9606816 100644 --- a/lib/odp-util.c +++ b/lib/odp-util.c @@ -1755,7 +1755,9 @@ parse_odp_key_mask_attr(const char *s, const struct simap *port_names, if (ovs_scan(s, "recirc_id(%"SCNi32")%n", &recirc_id, &n)) { nl_msg_put_u32(key, OVS_KEY_ATTR_RECIRC_ID, recirc_id); - nl_msg_put_u32(mask, OVS_KEY_ATTR_RECIRC_ID, UINT32_MAX); + if (mask) { + nl_msg_put_u32(mask, OVS_KEY_ATTR_RECIRC_ID, UINT32_MAX); + } return n; } } -- 2.39.5