nhrpd: Ensure invalid NAT extension info cannot be used

Signed-off-by: Reuben Dowle <reuben.dowle@4rf.com>

diff --git a/nhrpd/nhrp_peer.c b/nhrpd/nhrp_peer.c
index fcada245ea61d255fdadf4b872b0cede1491309c..74e502b2144ff230d9302ddba1e45d37211e2ad4 100644 (file)
--- a/nhrpd/nhrp_peer.c
+++ b/nhrpd/nhrp_peer.c
@@ -393,12 +393,14 @@ static void nhrp_process_nat_extension(struct nhrp_packet_parser *pp,
        struct nhrp_extension_header *ext;
        struct zbuf *extensions;
 
-
-       if (!proto || !cie_nbma || sockunion_family(proto) == AF_UNSPEC)
+       if (!cie_nbma)
                return;
 
        sockunion_family(cie_nbma) = AF_UNSPEC;
 
+       if (!proto || sockunion_family(proto) == AF_UNSPEC)
+               return;
+
        /* Handle extensions */
        extensions = zbuf_alloc(zbuf_used(&pp->extensions));
        if (extensions) {