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 90287114fc26a67a816abc98637d7d8359bf84e6..d2b60100e18e498d919a5018c4476074505bad81 100644 (file)
--- 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 7fbe6db163ac95ee446efec8af283540caff709e..ed36bb742e75d9058b6a5952eb35972a0abe7df4 100644 (file)
--- 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);