3340d77368
It fixes many buffer overflow in different protocol parsers, but none of them are critical, even in absense of Capsicum. Security: CVE-2016-7922, CVE-2016-7923, CVE-2016-7924, CVE-2016-7925 Security: CVE-2016-7926, CVE-2016-7927, CVE-2016-7928, CVE-2016-7929 Security: CVE-2016-7930, CVE-2016-7931, CVE-2016-7932, CVE-2016-7933 Security: CVE-2016-7934, CVE-2016-7935, CVE-2016-7936, CVE-2016-7937 Security: CVE-2016-7938, CVE-2016-7939, CVE-2016-7940, CVE-2016-7973 Security: CVE-2016-7974, CVE-2016-7975, CVE-2016-7983, CVE-2016-7984 Security: CVE-2016-7985, CVE-2016-7986, CVE-2016-7992, CVE-2016-7993 Security: CVE-2016-8574, CVE-2016-8575, CVE-2017-5202, CVE-2017-5203 Security: CVE-2017-5204, CVE-2017-5205, CVE-2017-5341, CVE-2017-5342 Security: CVE-2017-5482, CVE-2017-5483, CVE-2017-5484, CVE-2017-5485 Security: CVE-2017-5486
384 lines
13 KiB
C
384 lines
13 KiB
C
/*
|
|
* Copyright (c) 1998-2007 The TCPDUMP project
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that: (1) source code
|
|
* distributions retain the above copyright notice and this paragraph
|
|
* in its entirety, and (2) distributions including binary code include
|
|
* the above copyright notice and this paragraph in its entirety in
|
|
* the documentation or other materials provided with the distribution.
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND
|
|
* WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, WITHOUT
|
|
* LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
* FOR A PARTICULAR PURPOSE.
|
|
*
|
|
* Reference documentation:
|
|
* http://www.cisco.com/en/US/tech/tk389/tk689/technologies_tech_note09186a0080094c52.shtml
|
|
* http://www.cisco.com/warp/public/473/21.html
|
|
* http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
|
|
*
|
|
* Original code ode by Carles Kishimoto <carles.kishimoto@gmail.com>
|
|
*/
|
|
|
|
/* \summary: Cisco VLAN Trunking Protocol (VTP) printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "addrtoname.h"
|
|
#include "extract.h"
|
|
|
|
#define VTP_HEADER_LEN 36
|
|
#define VTP_DOMAIN_NAME_LEN 32
|
|
#define VTP_MD5_DIGEST_LEN 16
|
|
#define VTP_UPDATE_TIMESTAMP_LEN 12
|
|
#define VTP_VLAN_INFO_OFFSET 12
|
|
|
|
#define VTP_SUMMARY_ADV 0x01
|
|
#define VTP_SUBSET_ADV 0x02
|
|
#define VTP_ADV_REQUEST 0x03
|
|
#define VTP_JOIN_MESSAGE 0x04
|
|
|
|
struct vtp_vlan_ {
|
|
uint8_t len;
|
|
uint8_t status;
|
|
uint8_t type;
|
|
uint8_t name_len;
|
|
uint16_t vlanid;
|
|
uint16_t mtu;
|
|
uint32_t index;
|
|
};
|
|
|
|
static const struct tok vtp_message_type_values[] = {
|
|
{ VTP_SUMMARY_ADV, "Summary advertisement"},
|
|
{ VTP_SUBSET_ADV, "Subset advertisement"},
|
|
{ VTP_ADV_REQUEST, "Advertisement request"},
|
|
{ VTP_JOIN_MESSAGE, "Join message"},
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static const struct tok vtp_header_values[] = {
|
|
{ 0x01, "Followers"}, /* On Summary advertisement, 3rd byte is Followers */
|
|
{ 0x02, "Seq number"}, /* On Subset advertisement, 3rd byte is Sequence number */
|
|
{ 0x03, "Rsvd"}, /* On Adver. requests 3rd byte is Rsvd */
|
|
{ 0x04, "Rsvd"}, /* On Adver. requests 3rd byte is Rsvd */
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static const struct tok vtp_vlan_type_values[] = {
|
|
{ 0x01, "Ethernet"},
|
|
{ 0x02, "FDDI"},
|
|
{ 0x03, "TrCRF"},
|
|
{ 0x04, "FDDI-net"},
|
|
{ 0x05, "TrBRF"},
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static const struct tok vtp_vlan_status[] = {
|
|
{ 0x00, "Operational"},
|
|
{ 0x01, "Suspended"},
|
|
{ 0, NULL }
|
|
};
|
|
|
|
#define VTP_VLAN_SOURCE_ROUTING_RING_NUMBER 0x01
|
|
#define VTP_VLAN_SOURCE_ROUTING_BRIDGE_NUMBER 0x02
|
|
#define VTP_VLAN_STP_TYPE 0x03
|
|
#define VTP_VLAN_PARENT_VLAN 0x04
|
|
#define VTP_VLAN_TRANS_BRIDGED_VLAN 0x05
|
|
#define VTP_VLAN_PRUNING 0x06
|
|
#define VTP_VLAN_BRIDGE_TYPE 0x07
|
|
#define VTP_VLAN_ARP_HOP_COUNT 0x08
|
|
#define VTP_VLAN_STE_HOP_COUNT 0x09
|
|
#define VTP_VLAN_BACKUP_CRF_MODE 0x0A
|
|
|
|
static const struct tok vtp_vlan_tlv_values[] = {
|
|
{ VTP_VLAN_SOURCE_ROUTING_RING_NUMBER, "Source-Routing Ring Number TLV"},
|
|
{ VTP_VLAN_SOURCE_ROUTING_BRIDGE_NUMBER, "Source-Routing Bridge Number TLV"},
|
|
{ VTP_VLAN_STP_TYPE, "STP type TLV"},
|
|
{ VTP_VLAN_PARENT_VLAN, "Parent VLAN TLV"},
|
|
{ VTP_VLAN_TRANS_BRIDGED_VLAN, "Translationally bridged VLANs TLV"},
|
|
{ VTP_VLAN_PRUNING, "Pruning TLV"},
|
|
{ VTP_VLAN_BRIDGE_TYPE, "Bridge Type TLV"},
|
|
{ VTP_VLAN_ARP_HOP_COUNT, "Max ARP Hop Count TLV"},
|
|
{ VTP_VLAN_STE_HOP_COUNT, "Max STE Hop Count TLV"},
|
|
{ VTP_VLAN_BACKUP_CRF_MODE, "Backup CRF Mode TLV"},
|
|
{ 0, NULL }
|
|
};
|
|
|
|
static const struct tok vtp_stp_type_values[] = {
|
|
{ 1, "SRT"},
|
|
{ 2, "SRB"},
|
|
{ 3, "Auto"},
|
|
{ 0, NULL }
|
|
};
|
|
|
|
void
|
|
vtp_print (netdissect_options *ndo,
|
|
const u_char *pptr, u_int length)
|
|
{
|
|
int type, len, tlv_len, tlv_value, mgmtd_len;
|
|
const u_char *tptr;
|
|
const struct vtp_vlan_ *vtp_vlan;
|
|
|
|
if (length < VTP_HEADER_LEN)
|
|
goto trunc;
|
|
|
|
tptr = pptr;
|
|
|
|
ND_TCHECK2(*tptr, VTP_HEADER_LEN);
|
|
|
|
type = *(tptr+1);
|
|
ND_PRINT((ndo, "VTPv%u, Message %s (0x%02x), length %u",
|
|
*tptr,
|
|
tok2str(vtp_message_type_values,"Unknown message type", type),
|
|
type,
|
|
length));
|
|
|
|
/* In non-verbose mode, just print version and message type */
|
|
if (ndo->ndo_vflag < 1) {
|
|
return;
|
|
}
|
|
|
|
/* verbose mode print all fields */
|
|
ND_PRINT((ndo, "\n\tDomain name: "));
|
|
mgmtd_len = *(tptr + 3);
|
|
if (mgmtd_len < 1 || mgmtd_len > 32) {
|
|
ND_PRINT((ndo, " [invalid MgmtD Len %d]", mgmtd_len));
|
|
return;
|
|
}
|
|
fn_printzp(ndo, tptr + 4, mgmtd_len, NULL);
|
|
ND_PRINT((ndo, ", %s: %u",
|
|
tok2str(vtp_header_values, "Unknown", type),
|
|
*(tptr+2)));
|
|
|
|
tptr += VTP_HEADER_LEN;
|
|
|
|
switch (type) {
|
|
|
|
case VTP_SUMMARY_ADV:
|
|
|
|
/*
|
|
* SUMMARY ADVERTISEMENT
|
|
*
|
|
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Version | Code | Followers | MgmtD Len |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Management Domain Name (zero-padded to 32 bytes) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Configuration revision number |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Updater Identity IP address |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Update Timestamp (12 bytes) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | MD5 digest (16 bytes) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
*
|
|
*/
|
|
|
|
ND_TCHECK2(*tptr, 8);
|
|
ND_PRINT((ndo, "\n\t Config Rev %x, Updater %s",
|
|
EXTRACT_32BITS(tptr),
|
|
ipaddr_string(ndo, tptr+4)));
|
|
tptr += 8;
|
|
ND_TCHECK2(*tptr, VTP_UPDATE_TIMESTAMP_LEN);
|
|
ND_PRINT((ndo, ", Timestamp 0x%08x 0x%08x 0x%08x",
|
|
EXTRACT_32BITS(tptr),
|
|
EXTRACT_32BITS(tptr + 4),
|
|
EXTRACT_32BITS(tptr + 8)));
|
|
tptr += VTP_UPDATE_TIMESTAMP_LEN;
|
|
ND_TCHECK2(*tptr, VTP_MD5_DIGEST_LEN);
|
|
ND_PRINT((ndo, ", MD5 digest: %08x%08x%08x%08x",
|
|
EXTRACT_32BITS(tptr),
|
|
EXTRACT_32BITS(tptr + 4),
|
|
EXTRACT_32BITS(tptr + 8),
|
|
EXTRACT_32BITS(tptr + 12)));
|
|
tptr += VTP_MD5_DIGEST_LEN;
|
|
break;
|
|
|
|
case VTP_SUBSET_ADV:
|
|
|
|
/*
|
|
* SUBSET ADVERTISEMENT
|
|
*
|
|
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Version | Code | Seq number | MgmtD Len |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Management Domain Name (zero-padded to 32 bytes) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Configuration revision number |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | VLAN info field 1 |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | ................ |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | VLAN info field N |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
*
|
|
*/
|
|
|
|
ND_PRINT((ndo, ", Config Rev %x", EXTRACT_32BITS(tptr)));
|
|
|
|
/*
|
|
* VLAN INFORMATION
|
|
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | V info len | Status | VLAN type | VLAN name len |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | ISL vlan id | MTU size |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | 802.10 index (SAID) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | VLAN name |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
*
|
|
*/
|
|
|
|
tptr += 4;
|
|
while (tptr < (pptr+length)) {
|
|
|
|
len = *tptr;
|
|
if (len == 0)
|
|
break;
|
|
|
|
ND_TCHECK2(*tptr, len);
|
|
|
|
vtp_vlan = (const struct vtp_vlan_*)tptr;
|
|
ND_TCHECK(*vtp_vlan);
|
|
ND_PRINT((ndo, "\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
|
|
tok2str(vtp_vlan_status,"Unknown",vtp_vlan->status),
|
|
tok2str(vtp_vlan_type_values,"Unknown",vtp_vlan->type),
|
|
EXTRACT_16BITS(&vtp_vlan->vlanid),
|
|
EXTRACT_16BITS(&vtp_vlan->mtu),
|
|
EXTRACT_32BITS(&vtp_vlan->index)));
|
|
fn_printzp(ndo, tptr + VTP_VLAN_INFO_OFFSET, vtp_vlan->name_len, NULL);
|
|
|
|
/*
|
|
* Vlan names are aligned to 32-bit boundaries.
|
|
*/
|
|
len -= VTP_VLAN_INFO_OFFSET + 4*((vtp_vlan->name_len + 3)/4);
|
|
tptr += VTP_VLAN_INFO_OFFSET + 4*((vtp_vlan->name_len + 3)/4);
|
|
|
|
/* TLV information follows */
|
|
|
|
while (len > 0) {
|
|
|
|
/*
|
|
* Cisco specs says 2 bytes for type + 2 bytes for length, take only 1
|
|
* See: http://www.cisco.com/univercd/cc/td/doc/product/lan/trsrb/frames.htm
|
|
*/
|
|
type = *tptr;
|
|
tlv_len = *(tptr+1);
|
|
|
|
ND_PRINT((ndo, "\n\t\t%s (0x%04x) TLV",
|
|
tok2str(vtp_vlan_tlv_values, "Unknown", type),
|
|
type));
|
|
|
|
/*
|
|
* infinite loop check
|
|
*/
|
|
if (type == 0 || tlv_len == 0) {
|
|
return;
|
|
}
|
|
|
|
ND_TCHECK2(*tptr, tlv_len * 2 +2);
|
|
|
|
tlv_value = EXTRACT_16BITS(tptr+2);
|
|
|
|
switch (type) {
|
|
case VTP_VLAN_STE_HOP_COUNT:
|
|
ND_PRINT((ndo, ", %u", tlv_value));
|
|
break;
|
|
|
|
case VTP_VLAN_PRUNING:
|
|
ND_PRINT((ndo, ", %s (%u)",
|
|
tlv_value == 1 ? "Enabled" : "Disabled",
|
|
tlv_value));
|
|
break;
|
|
|
|
case VTP_VLAN_STP_TYPE:
|
|
ND_PRINT((ndo, ", %s (%u)",
|
|
tok2str(vtp_stp_type_values, "Unknown", tlv_value),
|
|
tlv_value));
|
|
break;
|
|
|
|
case VTP_VLAN_BRIDGE_TYPE:
|
|
ND_PRINT((ndo, ", %s (%u)",
|
|
tlv_value == 1 ? "SRB" : "SRT",
|
|
tlv_value));
|
|
break;
|
|
|
|
case VTP_VLAN_BACKUP_CRF_MODE:
|
|
ND_PRINT((ndo, ", %s (%u)",
|
|
tlv_value == 1 ? "Backup" : "Not backup",
|
|
tlv_value));
|
|
break;
|
|
|
|
/*
|
|
* FIXME those are the defined TLVs that lack a decoder
|
|
* you are welcome to contribute code ;-)
|
|
*/
|
|
|
|
case VTP_VLAN_SOURCE_ROUTING_RING_NUMBER:
|
|
case VTP_VLAN_SOURCE_ROUTING_BRIDGE_NUMBER:
|
|
case VTP_VLAN_PARENT_VLAN:
|
|
case VTP_VLAN_TRANS_BRIDGED_VLAN:
|
|
case VTP_VLAN_ARP_HOP_COUNT:
|
|
default:
|
|
print_unknown_data(ndo, tptr, "\n\t\t ", 2 + tlv_len*2);
|
|
break;
|
|
}
|
|
len -= 2 + tlv_len*2;
|
|
tptr += 2 + tlv_len*2;
|
|
}
|
|
}
|
|
break;
|
|
|
|
case VTP_ADV_REQUEST:
|
|
|
|
/*
|
|
* ADVERTISEMENT REQUEST
|
|
*
|
|
* 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Version | Code | Reserved | MgmtD Len |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Management Domain Name (zero-padded to 32 bytes) |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
* | Start value |
|
|
* +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
|
|
*
|
|
*/
|
|
|
|
ND_TCHECK2(*tptr, 4);
|
|
ND_PRINT((ndo, "\n\tStart value: %u", EXTRACT_32BITS(tptr)));
|
|
break;
|
|
|
|
case VTP_JOIN_MESSAGE:
|
|
|
|
/* FIXME - Could not find message format */
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
|
|
return;
|
|
|
|
trunc:
|
|
ND_PRINT((ndo, "[|vtp]"));
|
|
}
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 4
|
|
* End:
|
|
*/
|