Make 1-element arrays for fields that may repeat.

For various opaque LSAs, not only is the value of the TLV a "may
repeat", the TLVs *themselves* may repeat.

Also, pass a pointer to the TLV to ospf_print_grace_lsa() and
ospf_print_te_lsa(), rather than a pointer to the type field, as they
dissect a sequence of TLVs.

Hopefully, that will address Coverity CID 1426916, 1426917, and 1426920.

diff --git a/ospf.h b/ospf.h
index 4dca0af38b1951136655e5c1d169d21b144e64b8..ae7d2f942da4e507eb6f2963056e248742120103 100644 (file)
--- a/ospf.h
+++ b/ospf.h
@@ -230,21 +230,21 @@ struct lsa {
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */

-       } un_te_lsa_tlv;
+       } un_te_lsa_tlv[1]; /* may repeat */

 
         /* Opaque Grace LSA */
         struct {
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */
 
         /* Opaque Grace LSA */
         struct {
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */

-       } un_grace_tlv;
+       } un_grace_tlv[1]; /* may repeat */

 
         /* Opaque Router information LSA */
         struct {
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */
 
         /* Opaque Router information LSA */
         struct {
            nd_uint16_t type;
            nd_uint16_t length;
            nd_byte     data[1]; /* may repeat   */

-       } un_ri_tlv;
+       } un_ri_tlv[1]; /* may repeat */

 
         /* Unknown LSA */
         struct unknown {
 
         /* Unknown LSA */
         struct unknown {

diff --git a/print-ospf.c b/print-ospf.c
index 113ecde67b6f1d0b4c319bfe399aae43a623b9d0..921bed0cde7f8971e3615268a9d41594cacbce52 100644 (file)
--- a/print-ospf.c
+++ b/print-ospf.c
@@ -804,7 +804,7 @@ ospf_print_lsa(netdissect_options *ndo,
 
            switch (EXTRACT_U_1(lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:
 
            switch (EXTRACT_U_1(lsap->ls_hdr.un_lsa_id.opaque_field.opaque_type)) {
             case LS_OPAQUE_TYPE_RI:

-               tptr = (const uint8_t *)(&lsap->lsa_un.un_ri_tlv.type);
+               tptr = (const uint8_t *)(lsap->lsa_un.un_ri_tlv);

 
                while (ls_length != 0) {
                     ND_TCHECK_4(tptr);
 
                while (ls_length != 0) {
                     ND_TCHECK_4(tptr);


@@ -852,14 +852,14 @@ ospf_print_lsa(netdissect_options *ndo,
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:
                 break;
 
             case LS_OPAQUE_TYPE_GRACE:

-                if (ospf_print_grace_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_grace_tlv.type),
+                if (ospf_print_grace_lsa(ndo, (const uint8_t *)(lsap->lsa_un.un_grace_tlv),

                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:
                                          ls_length) == -1) {
                     return(ls_end);
                 }
                 break;
 
            case LS_OPAQUE_TYPE_TE:

-                if (ospf_print_te_lsa(ndo, (const uint8_t *)(&lsap->lsa_un.un_te_lsa_tlv.type),
+                if (ospf_print_te_lsa(ndo, (const uint8_t *)(lsap->lsa_un.un_te_lsa_tlv),

                                       ls_length) == -1) {
                     return(ls_end);
                 }
                                       ls_length) == -1) {
                     return(ls_end);
                 }