37e2725e53
It contains many fixes, including bounds checking, buffer overflows (in SLIP and bittok2str_internal), buffer over-reads, and infinite loops. One other notable change: Do not use getprotobynumber() for protocol name resolution. Do not do any protocol name resolution if -n is specified. Submitted by: gordon Reviewed by: delphij, emaste, glebius MFC after: 1 week Relnotes: Yes Security: CVE-2017-11108, CVE-2017-11541, CVE-2017-11542 Security: CVE-2017-11543, CVE-2017-12893, CVE-2017-12894 Security: CVE-2017-12895, CVE-2017-12896, CVE-2017-12897 Security: CVE-2017-12898, CVE-2017-12899, CVE-2017-12900 Security: CVE-2017-12901, CVE-2017-12902, CVE-2017-12985 Security: CVE-2017-12986, CVE-2017-12987, CVE-2017-12988 Security: CVE-2017-12989, CVE-2017-12990, CVE-2017-12991 Security: CVE-2017-12992, CVE-2017-12993, CVE-2017-12994 Security: CVE-2017-12995, CVE-2017-12996, CVE-2017-12997 Security: CVE-2017-12998, CVE-2017-12999, CVE-2017-13000 Security: CVE-2017-13001, CVE-2017-13002, CVE-2017-13003 Security: CVE-2017-13004, CVE-2017-13005, CVE-2017-13006 Security: CVE-2017-13007, CVE-2017-13008, CVE-2017-13009 Security: CVE-2017-13010, CVE-2017-13011, CVE-2017-13012 Security: CVE-2017-13013, CVE-2017-13014, CVE-2017-13015 Security: CVE-2017-13016, CVE-2017-13017, CVE-2017-13018 Security: CVE-2017-13019, CVE-2017-13020, CVE-2017-13021 Security: CVE-2017-13022, CVE-2017-13023, CVE-2017-13024 Security: CVE-2017-13025, CVE-2017-13026, CVE-2017-13027 Security: CVE-2017-13028, CVE-2017-13029, CVE-2017-13030 Security: CVE-2017-13031, CVE-2017-13032, CVE-2017-13033 Security: CVE-2017-13034, CVE-2017-13035, CVE-2017-13036 Security: CVE-2017-13037, CVE-2017-13038, CVE-2017-13039 Security: CVE-2017-13040, CVE-2017-13041, CVE-2017-13042 Security: CVE-2017-13043, CVE-2017-13044, CVE-2017-13045 Security: CVE-2017-13046, CVE-2017-13047, CVE-2017-13048 Security: CVE-2017-13049, CVE-2017-13050, CVE-2017-13051 Security: CVE-2017-13052, CVE-2017-13053, CVE-2017-13054 Security: CVE-2017-13055, CVE-2017-13687, CVE-2017-13688 Security: CVE-2017-13689, CVE-2017-13690, CVE-2017-13725 Differential Revision: https://reviews.freebsd.org/D12404
211 lines
5.9 KiB
C
211 lines
5.9 KiB
C
/*
|
|
* Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
|
|
* The Regents of the University of California. All rights reserved.
|
|
*
|
|
* 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, (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, and (3) all advertising materials mentioning
|
|
* features or use of this software display the following acknowledgement:
|
|
* ``This product includes software developed by the University of California,
|
|
* Lawrence Berkeley Laboratory and its contributors.'' Neither the name of
|
|
* the University nor the names of its contributors may be used to endorse
|
|
* or promote products derived from this software without specific prior
|
|
* written permission.
|
|
* 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.
|
|
*/
|
|
|
|
/* \summary: Cisco HDLC printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "addrtoname.h"
|
|
#include "ethertype.h"
|
|
#include "extract.h"
|
|
#include "chdlc.h"
|
|
|
|
static void chdlc_slarp_print(netdissect_options *, const u_char *, u_int);
|
|
|
|
static const struct tok chdlc_cast_values[] = {
|
|
{ CHDLC_UNICAST, "unicast" },
|
|
{ CHDLC_BCAST, "bcast" },
|
|
{ 0, NULL}
|
|
};
|
|
|
|
|
|
/* Standard CHDLC printer */
|
|
u_int
|
|
chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, register const u_char *p)
|
|
{
|
|
return chdlc_print(ndo, p, h->len);
|
|
}
|
|
|
|
u_int
|
|
chdlc_print(netdissect_options *ndo, register const u_char *p, u_int length)
|
|
{
|
|
u_int proto;
|
|
const u_char *bp = p;
|
|
|
|
if (length < CHDLC_HDRLEN)
|
|
goto trunc;
|
|
ND_TCHECK2(*p, CHDLC_HDRLEN);
|
|
proto = EXTRACT_16BITS(&p[2]);
|
|
if (ndo->ndo_eflag) {
|
|
ND_PRINT((ndo, "%s, ethertype %s (0x%04x), length %u: ",
|
|
tok2str(chdlc_cast_values, "0x%02x", p[0]),
|
|
tok2str(ethertype_values, "Unknown", proto),
|
|
proto,
|
|
length));
|
|
}
|
|
|
|
length -= CHDLC_HDRLEN;
|
|
p += CHDLC_HDRLEN;
|
|
|
|
switch (proto) {
|
|
case ETHERTYPE_IP:
|
|
ip_print(ndo, p, length);
|
|
break;
|
|
case ETHERTYPE_IPV6:
|
|
ip6_print(ndo, p, length);
|
|
break;
|
|
case CHDLC_TYPE_SLARP:
|
|
chdlc_slarp_print(ndo, p, length);
|
|
break;
|
|
#if 0
|
|
case CHDLC_TYPE_CDP:
|
|
chdlc_cdp_print(p, length);
|
|
break;
|
|
#endif
|
|
case ETHERTYPE_MPLS:
|
|
case ETHERTYPE_MPLS_MULTI:
|
|
mpls_print(ndo, p, length);
|
|
break;
|
|
case ETHERTYPE_ISO:
|
|
/* is the fudge byte set ? lets verify by spotting ISO headers */
|
|
if (length < 2)
|
|
goto trunc;
|
|
ND_TCHECK_16BITS(p);
|
|
if (*(p+1) == 0x81 ||
|
|
*(p+1) == 0x82 ||
|
|
*(p+1) == 0x83)
|
|
isoclns_print(ndo, p + 1, length - 1);
|
|
else
|
|
isoclns_print(ndo, p, length);
|
|
break;
|
|
default:
|
|
if (!ndo->ndo_eflag)
|
|
ND_PRINT((ndo, "unknown CHDLC protocol (0x%04x)", proto));
|
|
break;
|
|
}
|
|
|
|
return (CHDLC_HDRLEN);
|
|
|
|
trunc:
|
|
ND_PRINT((ndo, "[|chdlc]"));
|
|
return ndo->ndo_snapend - bp;
|
|
}
|
|
|
|
/*
|
|
* The fixed-length portion of a SLARP packet.
|
|
*/
|
|
struct cisco_slarp {
|
|
uint8_t code[4];
|
|
#define SLARP_REQUEST 0
|
|
#define SLARP_REPLY 1
|
|
#define SLARP_KEEPALIVE 2
|
|
union {
|
|
struct {
|
|
uint8_t addr[4];
|
|
uint8_t mask[4];
|
|
} addr;
|
|
struct {
|
|
uint8_t myseq[4];
|
|
uint8_t yourseq[4];
|
|
uint8_t rel[2];
|
|
} keep;
|
|
} un;
|
|
};
|
|
|
|
#define SLARP_MIN_LEN 14
|
|
#define SLARP_MAX_LEN 18
|
|
|
|
static void
|
|
chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
|
|
{
|
|
const struct cisco_slarp *slarp;
|
|
u_int sec,min,hrs,days;
|
|
|
|
ND_PRINT((ndo, "SLARP (length: %u), ",length));
|
|
if (length < SLARP_MIN_LEN)
|
|
goto trunc;
|
|
|
|
slarp = (const struct cisco_slarp *)cp;
|
|
ND_TCHECK2(*slarp, SLARP_MIN_LEN);
|
|
switch (EXTRACT_32BITS(&slarp->code)) {
|
|
case SLARP_REQUEST:
|
|
ND_PRINT((ndo, "request"));
|
|
/*
|
|
* At least according to William "Chops" Westfield's
|
|
* message in
|
|
*
|
|
* http://www.nethelp.no/net/cisco-hdlc.txt
|
|
*
|
|
* the address and mask aren't used in requests -
|
|
* they're just zero.
|
|
*/
|
|
break;
|
|
case SLARP_REPLY:
|
|
ND_PRINT((ndo, "reply %s/%s",
|
|
ipaddr_string(ndo, &slarp->un.addr.addr),
|
|
ipaddr_string(ndo, &slarp->un.addr.mask)));
|
|
break;
|
|
case SLARP_KEEPALIVE:
|
|
ND_PRINT((ndo, "keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x",
|
|
EXTRACT_32BITS(&slarp->un.keep.myseq),
|
|
EXTRACT_32BITS(&slarp->un.keep.yourseq),
|
|
EXTRACT_16BITS(&slarp->un.keep.rel)));
|
|
|
|
if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */
|
|
cp += SLARP_MIN_LEN;
|
|
ND_TCHECK2(*cp, 4);
|
|
sec = EXTRACT_32BITS(cp) / 1000;
|
|
min = sec / 60; sec -= min * 60;
|
|
hrs = min / 60; min -= hrs * 60;
|
|
days = hrs / 24; hrs -= days * 24;
|
|
ND_PRINT((ndo, ", link uptime=%ud%uh%um%us",days,hrs,min,sec));
|
|
}
|
|
break;
|
|
default:
|
|
ND_PRINT((ndo, "0x%02x unknown", EXTRACT_32BITS(&slarp->code)));
|
|
if (ndo->ndo_vflag <= 1)
|
|
print_unknown_data(ndo,cp+4,"\n\t",length-4);
|
|
break;
|
|
}
|
|
|
|
if (SLARP_MAX_LEN < length && ndo->ndo_vflag)
|
|
ND_PRINT((ndo, ", (trailing junk: %d bytes)", length - SLARP_MAX_LEN));
|
|
if (ndo->ndo_vflag > 1)
|
|
print_unknown_data(ndo,cp+4,"\n\t",length-4);
|
|
return;
|
|
|
|
trunc:
|
|
ND_PRINT((ndo, "[|slarp]"));
|
|
}
|
|
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|