summaryrefslogtreecommitdiffstats
path: root/src/plugins/map/ip6_map.c
diff options
context:
space:
mode:
authorAndrew Yourtchenko <ayourtch@gmail.com>2019-11-18 10:37:24 +0000
committerOle Trøan <otroan@employees.org>2019-11-19 03:43:57 +0000
commit360b523b52a91bd0d1d7de1247141367c484d70f (patch)
treec3d4a14cddf4f8b7603b91ca1c409cdf4f45d6f8 /src/plugins/map/ip6_map.c
parent9a6dc8a9376e7270331255861b3ead1045b40c6d (diff)
map: fix coverity issue 205684
ip4_map_get_domain returns d0 = 0 in case of no domain, and sets error MAP_ERROR_NO_DOMAIN. Rearrange the clauses in the logical check that relies on dereferencing d0 such that boolean shortcutting takes care of not referencing the null pointer. Change-Id: I378adc120836ea920fc530808ac3c1f98ab8d593 Type: fix Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Diffstat (limited to 'src/plugins/map/ip6_map.c')
-rw-r--r--src/plugins/map/ip6_map.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/map/ip6_map.c b/src/plugins/map/ip6_map.c
index 47958f92a38..899371effdf 100644
--- a/src/plugins/map/ip6_map.c
+++ b/src/plugins/map/ip6_map.c
@@ -618,8 +618,8 @@ ip6_map_post_ip4_reass (vlib_main_t * vm,
MAP_ERROR_DECAP_SEC_CHECK;
if (PREDICT_FALSE
- (d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)
- && error0 == MAP_ERROR_NONE))
+ (error0 == MAP_ERROR_NONE &&
+ d0->mtu && (clib_host_to_net_u16 (ip40->length) > d0->mtu)))
{
vnet_buffer (p0)->ip_frag.flags = 0;
vnet_buffer (p0)->ip_frag.next_index = IP_FRAG_NEXT_IP4_LOOKUP;