CI: Simplify some Coverity Scan props.

[tcpdump] / print-l2tp.c

diff --git a/print-l2tp.c b/print-l2tp.c
index 51bb93a04122e6fab17da1c8c020deb03f32b1fb..024705f821ba5e1e25299bcb169a921f3f6355b4 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -577,10 +577,7 @@ l2tp_avp_print(netdissect_options *ndo, const u_char *dat, u_int length)
        len = GET_BE_U_2(dat) & L2TP_AVP_HDR_LEN_MASK;
 
        /* If it is not long enough to contain the header, we'll give up. */
-       if (len < 6) {
-               ND_PRINT(" (AVP length %u < 6)", len);
-               goto invalid;
-       }
+       ND_LCHECKMSG_U(len, 6, "AVP length");
 
        /* If it goes past the end of the remaining length of the packet,
           we'll give up. */
@@ -810,6 +807,8 @@ l2tp_print(netdissect_options *ndo, const u_char *dat, u_int length)
 
        if (flag_o) {   /* Offset Size */
                pad =  GET_BE_U_2(ptr);
+               /* Offset padding octets in packet buffer? */
+               ND_TCHECK_LEN(ptr + 2, pad);
                ptr += (2 + pad);
                cnt += (2 + pad);
        }