From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Sat, 26 Oct 2019 00:26:29 +0000 (-0400)
Subject: bfdd: VRF and Coverity
X-Git-Tag: base_7.3~218^2~4
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=102e21573717be50813e5a51a9f5f4220e2d7c94;p=matthieu%2Ffrr.git

bfdd: VRF and Coverity

Fixup a couple of Coverity issues surrounding pointers

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
---

diff --git a/bfdd/bfd.c b/bfdd/bfd.c
index 90287114fc..d2b60100e1 100644
--- a/bfdd/bfd.c
+++ b/bfdd/bfd.c
@@ -159,6 +159,7 @@ int bfd_session_enable(struct bfd_session *bs)
 	bs->vrf = vrf;
 	if (bs->vrf == NULL)
 		bs->vrf = vrf_lookup_by_id(VRF_DEFAULT);
+	assert(bs->vrf);
 
 	if (bs->key.ifname[0]
 	    && BFD_CHECK_FLAG(bs->flags, BFD_SESS_FLAG_MH) == 0)
diff --git a/bfdd/bfd_packet.c b/bfdd/bfd_packet.c
index 7fbe6db163..ed36bb742e 100644
--- a/bfdd/bfd_packet.c
+++ b/bfdd/bfd_packet.c
@@ -529,8 +529,7 @@ int bfd_recv_cb(struct thread *t)
 	uint8_t msgbuf[1516];
 	struct bfd_vrf_global *bvrf = THREAD_ARG(t);
 
-	if (bvrf)
-		vrfid = bvrf->vrf->vrf_id;
+	vrfid = bvrf->vrf->vrf_id;
 	/* Schedule next read. */
 	bfd_sd_reschedule(bvrf, sd);