pgm: fix the way we step through the packet.

Step past the PGM header after we finish processing it and before we
process the message-type-specific header.

Step past the message-type-specific fixed-length header before we
process the stuff after that header.

This makes the code a bit clearer (by explicitly advancing bp by the
size of the stuff we just processed, rather than doing so by trickery
involving adding 1 to a pointer to a structure), and fixes the
processing of message types that don't have a message-type-specific
header (where we weren't stepping past the PGM header).  It also affects
the way we handle messages of an unknown type.

diff --git a/print-pgm.c b/print-pgm.c
index 3b063ba76f87f1fa9faee1a0aa43586cc0fa3113..c1c56932a21df2f7d56b99e81e0ee977fe695d6a 100644 (file)
--- a/print-pgm.c
+++ b/print-pgm.c
@@ -220,13 +220,14 @@ pgm_print(netdissect_options *ndo,
                     pgm->pgm_gsid[3],
                      pgm->pgm_gsid[4],
                      pgm->pgm_gsid[5]);
+       bp += sizeof(struct pgm_header);
        switch (pgm_type_val) {
        case PGM_SPM: {
            const struct pgm_spm *spm;
 
-           spm = (const struct pgm_spm *)(pgm + 1);
+           spm = (const struct pgm_spm *)bp;
            ND_TCHECK_SIZE(spm);
-           bp = (const u_char *) (spm + 1);
+           bp += sizeof(struct pgm_spm);
 
            switch (GET_BE_U_2(spm->pgms_nla_afi)) {
            case AFNUM_IP:
@@ -256,9 +257,9 @@ pgm_print(netdissect_options *ndo,
            const struct pgm_poll *pgm_poll;
            uint32_t ivl, rnd, mask;
 
-           pgm_poll = (const struct pgm_poll *)(pgm + 1);
+           pgm_poll = (const struct pgm_poll *)bp;
            ND_TCHECK_SIZE(pgm_poll);
-           bp = (const u_char *) (pgm_poll + 1);
+           bp += sizeof(struct pgm_poll);
 
            switch (GET_BE_U_2(pgm_poll->pgmp_nla_afi)) {
            case AFNUM_IP:
@@ -294,33 +295,33 @@ pgm_print(netdissect_options *ndo,
        case PGM_POLR: {
            const struct pgm_polr *polr_msg;
 
-           polr_msg = (const struct pgm_polr *)(pgm + 1);
+           polr_msg = (const struct pgm_polr *)bp;
            ND_TCHECK_SIZE(polr_msg);
            ND_PRINT("POLR seq %u round %u",
                         GET_BE_U_4(polr_msg->pgmp_seq),
                         GET_BE_U_2(polr_msg->pgmp_round));
-           bp = (const u_char *) (polr_msg + 1);
+           bp += sizeof(struct pgm_polr);
            break;
        }
        case PGM_ODATA: {
            const struct pgm_data *odata;
 
-           odata = (const struct pgm_data *)(pgm + 1);
+           odata = (const struct pgm_data *)bp;
            ND_PRINT("ODATA trail %u seq %u",
                         GET_BE_U_4(odata->pgmd_trailseq),
                         GET_BE_U_4(odata->pgmd_seq));
-           bp = (const u_char *) (odata + 1);
+           bp += sizeof(struct pgm_data);
            break;
        }
 
        case PGM_RDATA: {
            const struct pgm_data *rdata;
 
-           rdata = (const struct pgm_data *)(pgm + 1);
+           rdata = (const struct pgm_data *)bp;
            ND_PRINT("RDATA trail %u seq %u",
                         GET_BE_U_4(rdata->pgmd_trailseq),
                         GET_BE_U_4(rdata->pgmd_seq));
-           bp = (const u_char *) (rdata + 1);
+           bp += sizeof(struct pgm_data);
            break;
        }
 
@@ -330,9 +331,9 @@ pgm_print(netdissect_options *ndo,
            const struct pgm_nak *nak;
            char source_buf[INET6_ADDRSTRLEN], group_buf[INET6_ADDRSTRLEN];
 
-           nak = (const struct pgm_nak *)(pgm + 1);
+           nak = (const struct pgm_nak *)bp;
            ND_TCHECK_SIZE(nak);
-           bp = (const u_char *) (nak + 1);
+           bp += sizeof(struct pgm_nak);
 
            /*
             * Skip past the source, saving info along the way
@@ -399,11 +400,11 @@ pgm_print(netdissect_options *ndo,
        case PGM_ACK: {
            const struct pgm_ack *ack;
 
-           ack = (const struct pgm_ack *)(pgm + 1);
+           ack = (const struct pgm_ack *)bp;
            ND_TCHECK_SIZE(ack);
            ND_PRINT("ACK seq %u",
                         GET_BE_U_4(ack->pgma_rx_max_seq));
-           bp = (const u_char *) (ack + 1);
+           bp += sizeof(struct pgm_ack);
            break;
        }
 

diff --git a/tests/pgm_opts_asan.out b/tests/pgm_opts_asan.out
index 6cc9b06512a654d77fc0a92bc3a0434715cc9b1b..7527bda3b2e2e8a90bc0f04b8245327bd1a236e4 100644 (file)
--- a/tests/pgm_opts_asan.out
+++ b/tests/pgm_opts_asan.out
@@ -1,2 +1,2 @@
     1  00:04:16.587271427 IP (tos 0x41,ECT(1), id 0, offset 0, flags [none], proto PGM (113), length 32639, options (unknown 89 [bad length 232]), bad cksum 5959 (->9eb9)!)
-    128.121.89.107 > 89.89.16.63: 128.121.89.107.4 > 89.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f OPTS LEN 225 OPT_1F [13]  OPT_06 [26]  PATH_NLA [4] [|pgm]
+    128.121.89.107 > 89.89.16.63: 128.121.89.107.4 > 89.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f[Bad OPT_LENGTH option, length 0 != 4]

diff --git a/tests/pgm_opts_asan_2.out b/tests/pgm_opts_asan_2.out
index 1785a571cf65123d19b2f2cbf9efcd917f3adc83..53830c8576fccd262fac1d018ef4e8e45f714d4c 100644 (file)
--- a/tests/pgm_opts_asan_2.out
+++ b/tests/pgm_opts_asan_2.out
@@ -1,2 +1,2 @@
     1  00:04:16.587271427 IP (tos 0x41,ECT(1), id 0, offset 0, flags [none], proto PGM (113), length 32639, options (unknown 89 [bad length 232]), bad cksum 5959 (->96b9)!)
-    128.121.89.107 > 89.89.16.63: 128.121.89.107.4 > 89.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f OPTS LEN 225 OPT_1F [13]  OPT_06 [26] [Bad OPT_PGMCC_DATA option, length 4 < 12]
+    128.121.89.107 > 89.89.16.63: 128.121.89.107.4 > 89.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f[Bad OPT_LENGTH option, length 0 != 4]

diff --git a/tests/pgm_opts_asan_3.out b/tests/pgm_opts_asan_3.out
index 2e35f2fa34efd7b02e443b2cdea3e3f479171740..b8864e2967ba72ffb99d51db8bd0599d8603c487 100644 (file)
--- a/tests/pgm_opts_asan_3.out
+++ b/tests/pgm_opts_asan_3.out
@@ -1,2 +1,2 @@
     1  00:04:16.587271427 IP (tos 0x41,ECT(1), id 0, offset 0, flags [none], proto PGM (113), length 32639, options (unknown 89 [bad length 232]), bad cksum 5959 (->f814)!)
-    128.121.89.16 > 0.89.16.63: 128.121.89.16.4 > 0.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f OPTS LEN 225 OPT_1F [13]  OPT_06 [26] [Bad OPT_REDIRECT option, length 4 < 8]
+    128.121.89.16 > 0.89.16.63: 128.121.89.16.4 > 0.89.16.63.225: PGM, length 0 0x3414eb1f0022 UNKNOWN type 0x1f[Bad OPT_LENGTH option, length 0 != 4]