aboutsummaryrefslogtreecommitdiffstats
path: root/src/vnet/srmpls/sr_mpls_steering.c
diff options
context:
space:
mode:
authorChris Luke <chrisy@flirble.org>2018-03-29 12:56:58 -0700
committerChris Luke <chrisy@flirble.org>2018-03-29 15:23:56 -0700
commit30684ac044bbb8e11ef100a24c01eb37ba7a8876 (patch)
treeac5d526793fbafed606355c22d8e627e66d95786 /src/vnet/srmpls/sr_mpls_steering.c
parentf3a3bad8006afb0b379761dfe4d5d25de07b32cc (diff)
Coverity fixes (VPP-1204)
Minor bug fixes CID 183000: double close CID 180996: dead code CID 180995: NULL deref CID 181957: NULL deref CID 182676: NULL deref CID 182675: NULL deref Change-Id: Id35e391c95fafb8cd771984ee8a1a6e597056d37 Signed-off-by: Chris Luke <chrisy@flirble.org>
Diffstat (limited to 'src/vnet/srmpls/sr_mpls_steering.c')
-rwxr-xr-xsrc/vnet/srmpls/sr_mpls_steering.c18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/vnet/srmpls/sr_mpls_steering.c b/src/vnet/srmpls/sr_mpls_steering.c
index 8bb072c8812..c5ddab73ce4 100755
--- a/src/vnet/srmpls/sr_mpls_steering.c
+++ b/src/vnet/srmpls/sr_mpls_steering.c
@@ -393,22 +393,16 @@ sr_mpls_steering_policy_add (mpls_label_t bsid, u32 table_id,
memset (&key, 0, sizeof (sr_mpls_steering_key_t));
- /* Compute the steer policy key */
- if (traffic_type == SR_STEER_IPV4 || traffic_type == SR_STEER_IPV6)
- {
- key.prefix.as_u64[0] = prefix->as_u64[0];
- key.prefix.as_u64[1] = prefix->as_u64[1];
- key.mask_width = mask_width;
- key.fib_table = (table_id != (u32) ~ 0 ? table_id : 0);
- }
- else
+ if (traffic_type != SR_STEER_IPV4 && traffic_type != SR_STEER_IPV6)
return -1;
+ /* Compute the steer policy key */
+ key.prefix.as_u64[0] = prefix->as_u64[0];
+ key.prefix.as_u64[1] = prefix->as_u64[1];
+ key.mask_width = mask_width;
+ key.fib_table = (table_id != (u32) ~ 0 ? table_id : 0);
key.traffic_type = traffic_type;
- if (traffic_type != SR_STEER_IPV4 && traffic_type != SR_STEER_IPV6)
- return -1;
-
/*
* Search for steering policy. If already exists we are adding a new
* color.