CVE-2017-13029/PPP: Fix a bounds check, and clean up other bounds checks.

[tcpdump] / print-radius.c

diff --git a/print-radius.c b/print-radius.c
index ae50efd84f6852efaa10acd9aeeac95400d61974..582795a12de4c194d0d6d882cbaa144e09ce2fe3 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -47,9 +47,15 @@
  * RFC 4675:
  *      "RADIUS Attributes for Virtual LAN and Priority Support"
  *
  * RFC 4675:
  *      "RADIUS Attributes for Virtual LAN and Priority Support"
  *

+ * RFC 4849:
+ *      "RADIUS Filter Rule Attribute"
+ *

  * RFC 5176:
  *      "Dynamic Authorization Extensions to RADIUS"
  *
  * RFC 5176:
  *      "Dynamic Authorization Extensions to RADIUS"
  *

+ * RFC 7155:
+ *      "Diameter Network Access Server Application"
+ *

  * Alfredo Andres Omella ([email protected]) v0.1 2000/09/15
  *
  * TODO: Among other things to print ok MacIntosh and Vendor values
  * Alfredo Andres Omella ([email protected]) v0.1 2000/09/15
  *
  * TODO: Among other things to print ok MacIntosh and Vendor values


@@ -372,7 +378,8 @@ static const char *prompt[]={ "No Echo",
                             };
 
 
                             };
 
 

-struct attrtype { const char *name;      /* Attribute name                 */
+static struct attrtype {
+                  const char *name;      /* Attribute name                 */

                   const char **subtypes; /* Standard Values (if any)       */
                   u_char siz_subtypes;   /* Size of total standard values  */
                   u_char first_subtype;  /* First standard value is 0 or 1 */
                   const char **subtypes; /* Standard Values (if any)       */
                   u_char siz_subtypes;   /* Size of total standard values  */
                   u_char first_subtype;  /* First standard value is 0 or 1 */


@@ -471,8 +478,9 @@ struct attrtype { const char *name;      /* Attribute name                 */
      { "CUI",                             NULL, 0, 0, print_attr_string },
      { "Tunnel-Client-Auth-ID",           NULL, 0, 0, print_attr_string },
      { "Tunnel-Server-Auth-ID",           NULL, 0, 0, print_attr_string },
      { "CUI",                             NULL, 0, 0, print_attr_string },
      { "Tunnel-Client-Auth-ID",           NULL, 0, 0, print_attr_string },
      { "Tunnel-Server-Auth-ID",           NULL, 0, 0, print_attr_string },

-     { "Unassigned",                      NULL, 0, 0, NULL }, /*92*/
-     { "Unassigned",                      NULL, 0, 0, NULL }  /*93*/
+     { "NAS-Filter-Rule",                 NULL, 0, 0, print_attr_string },
+     { "Unassigned",                      NULL, 0, 0, NULL },  /*93*/
+     { "Originating-Line-Info",           NULL, 0, 0, NULL }

   };
 
 
   };