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
129 lines
3.0 KiB
C
129 lines
3.0 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.
|
|
*
|
|
* Original code by Carles Kishimoto <carles.kishimoto@gmail.com>
|
|
*/
|
|
|
|
/* \summary: Dynamic Trunking Protocol (DTP) printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "addrtoname.h"
|
|
#include "extract.h"
|
|
|
|
static const char tstr[] = " [|dtp]";
|
|
|
|
#define DTP_HEADER_LEN 1
|
|
#define DTP_DOMAIN_TLV 0x0001
|
|
#define DTP_STATUS_TLV 0x0002
|
|
#define DTP_DTP_TYPE_TLV 0x0003
|
|
#define DTP_NEIGHBOR_TLV 0x0004
|
|
|
|
static const struct tok dtp_tlv_values[] = {
|
|
{ DTP_DOMAIN_TLV, "Domain TLV"},
|
|
{ DTP_STATUS_TLV, "Status TLV"},
|
|
{ DTP_DTP_TYPE_TLV, "DTP type TLV"},
|
|
{ DTP_NEIGHBOR_TLV, "Neighbor TLV"},
|
|
{ 0, NULL}
|
|
};
|
|
|
|
void
|
|
dtp_print (netdissect_options *ndo, const u_char *pptr, u_int length)
|
|
{
|
|
int type, len;
|
|
const u_char *tptr;
|
|
|
|
if (length < DTP_HEADER_LEN)
|
|
goto trunc;
|
|
|
|
tptr = pptr;
|
|
|
|
ND_TCHECK2(*tptr, DTP_HEADER_LEN);
|
|
|
|
ND_PRINT((ndo, "DTPv%u, length %u",
|
|
(*tptr),
|
|
length));
|
|
|
|
/*
|
|
* In non-verbose mode, just print version.
|
|
*/
|
|
if (ndo->ndo_vflag < 1) {
|
|
return;
|
|
}
|
|
|
|
tptr += DTP_HEADER_LEN;
|
|
|
|
while (tptr < (pptr+length)) {
|
|
|
|
ND_TCHECK2(*tptr, 4);
|
|
type = EXTRACT_16BITS(tptr);
|
|
len = EXTRACT_16BITS(tptr+2);
|
|
/* XXX: should not be but sometimes it is, see the test captures */
|
|
if (type == 0)
|
|
return;
|
|
ND_PRINT((ndo, "\n\t%s (0x%04x) TLV, length %u",
|
|
tok2str(dtp_tlv_values, "Unknown", type),
|
|
type, len));
|
|
|
|
/* infinite loop check */
|
|
if (len < 4)
|
|
goto invalid;
|
|
ND_TCHECK2(*tptr, len);
|
|
|
|
switch (type) {
|
|
case DTP_DOMAIN_TLV:
|
|
ND_PRINT((ndo, ", "));
|
|
fn_printzp(ndo, tptr+4, len-4, pptr+length);
|
|
break;
|
|
|
|
case DTP_STATUS_TLV:
|
|
case DTP_DTP_TYPE_TLV:
|
|
if (len < 5)
|
|
goto invalid;
|
|
ND_PRINT((ndo, ", 0x%x", *(tptr+4)));
|
|
break;
|
|
|
|
case DTP_NEIGHBOR_TLV:
|
|
if (len < 10)
|
|
goto invalid;
|
|
ND_PRINT((ndo, ", %s", etheraddr_string(ndo, tptr+4)));
|
|
break;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
tptr += len;
|
|
}
|
|
|
|
return;
|
|
|
|
invalid:
|
|
ND_PRINT((ndo, "%s", istr));
|
|
return;
|
|
trunc:
|
|
ND_PRINT((ndo, "%s", tstr));
|
|
}
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 4
|
|
* End:
|
|
*/
|