mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-23 11:18:54 +00:00
0bff6a5af8
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
464 lines
13 KiB
C
464 lines
13 KiB
C
/*
|
|
* Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2000
|
|
* 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: Ethernet printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "extract.h"
|
|
#include "addrtoname.h"
|
|
#include "ethertype.h"
|
|
#include "ether.h"
|
|
|
|
const struct tok ethertype_values[] = {
|
|
{ ETHERTYPE_IP, "IPv4" },
|
|
{ ETHERTYPE_MPLS, "MPLS unicast" },
|
|
{ ETHERTYPE_MPLS_MULTI, "MPLS multicast" },
|
|
{ ETHERTYPE_IPV6, "IPv6" },
|
|
{ ETHERTYPE_8021Q, "802.1Q" },
|
|
{ ETHERTYPE_8021Q9100, "802.1Q-9100" },
|
|
{ ETHERTYPE_8021QinQ, "802.1Q-QinQ" },
|
|
{ ETHERTYPE_8021Q9200, "802.1Q-9200" },
|
|
{ ETHERTYPE_VMAN, "VMAN" },
|
|
{ ETHERTYPE_PUP, "PUP" },
|
|
{ ETHERTYPE_ARP, "ARP"},
|
|
{ ETHERTYPE_REVARP, "Reverse ARP"},
|
|
{ ETHERTYPE_NS, "NS" },
|
|
{ ETHERTYPE_SPRITE, "Sprite" },
|
|
{ ETHERTYPE_TRAIL, "Trail" },
|
|
{ ETHERTYPE_MOPDL, "MOP DL" },
|
|
{ ETHERTYPE_MOPRC, "MOP RC" },
|
|
{ ETHERTYPE_DN, "DN" },
|
|
{ ETHERTYPE_LAT, "LAT" },
|
|
{ ETHERTYPE_SCA, "SCA" },
|
|
{ ETHERTYPE_TEB, "TEB" },
|
|
{ ETHERTYPE_LANBRIDGE, "Lanbridge" },
|
|
{ ETHERTYPE_DECDNS, "DEC DNS" },
|
|
{ ETHERTYPE_DECDTS, "DEC DTS" },
|
|
{ ETHERTYPE_VEXP, "VEXP" },
|
|
{ ETHERTYPE_VPROD, "VPROD" },
|
|
{ ETHERTYPE_ATALK, "Appletalk" },
|
|
{ ETHERTYPE_AARP, "Appletalk ARP" },
|
|
{ ETHERTYPE_IPX, "IPX" },
|
|
{ ETHERTYPE_PPP, "PPP" },
|
|
{ ETHERTYPE_MPCP, "MPCP" },
|
|
{ ETHERTYPE_SLOW, "Slow Protocols" },
|
|
{ ETHERTYPE_PPPOED, "PPPoE D" },
|
|
{ ETHERTYPE_PPPOES, "PPPoE S" },
|
|
{ ETHERTYPE_EAPOL, "EAPOL" },
|
|
{ ETHERTYPE_RRCP, "RRCP" },
|
|
{ ETHERTYPE_MS_NLB_HB, "MS NLB heartbeat" },
|
|
{ ETHERTYPE_JUMBO, "Jumbo" },
|
|
{ ETHERTYPE_LOOPBACK, "Loopback" },
|
|
{ ETHERTYPE_ISO, "OSI" },
|
|
{ ETHERTYPE_GRE_ISO, "GRE-OSI" },
|
|
{ ETHERTYPE_CFM_OLD, "CFM (old)" },
|
|
{ ETHERTYPE_CFM, "CFM" },
|
|
{ ETHERTYPE_IEEE1905_1, "IEEE1905.1" },
|
|
{ ETHERTYPE_LLDP, "LLDP" },
|
|
{ ETHERTYPE_TIPC, "TIPC"},
|
|
{ ETHERTYPE_GEONET_OLD, "GeoNet (old)"},
|
|
{ ETHERTYPE_GEONET, "GeoNet"},
|
|
{ ETHERTYPE_CALM_FAST, "CALM FAST"},
|
|
{ ETHERTYPE_AOE, "AoE" },
|
|
{ ETHERTYPE_MEDSA, "MEDSA" },
|
|
{ 0, NULL}
|
|
};
|
|
|
|
static inline void
|
|
ether_hdr_print(netdissect_options *ndo,
|
|
const u_char *bp, u_int length)
|
|
{
|
|
register const struct ether_header *ep;
|
|
uint16_t length_type;
|
|
|
|
ep = (const struct ether_header *)bp;
|
|
|
|
ND_PRINT((ndo, "%s > %s",
|
|
etheraddr_string(ndo, ESRC(ep)),
|
|
etheraddr_string(ndo, EDST(ep))));
|
|
|
|
length_type = EXTRACT_16BITS(&ep->ether_length_type);
|
|
if (!ndo->ndo_qflag) {
|
|
if (length_type <= ETHERMTU) {
|
|
ND_PRINT((ndo, ", 802.3"));
|
|
length = length_type;
|
|
} else
|
|
ND_PRINT((ndo, ", ethertype %s (0x%04x)",
|
|
tok2str(ethertype_values,"Unknown", length_type),
|
|
length_type));
|
|
} else {
|
|
if (length_type <= ETHERMTU) {
|
|
ND_PRINT((ndo, ", 802.3"));
|
|
length = length_type;
|
|
} else
|
|
ND_PRINT((ndo, ", %s", tok2str(ethertype_values,"Unknown Ethertype (0x%04x)", length_type)));
|
|
}
|
|
|
|
ND_PRINT((ndo, ", length %u: ", length));
|
|
}
|
|
|
|
/*
|
|
* Print an Ethernet frame.
|
|
* This might be encapsulated within another frame; we might be passed
|
|
* a pointer to a function that can print header information for that
|
|
* frame's protocol, and an argument to pass to that function.
|
|
*
|
|
* FIXME: caplen can and should be derived from ndo->ndo_snapend and p.
|
|
*/
|
|
u_int
|
|
ether_print(netdissect_options *ndo,
|
|
const u_char *p, u_int length, u_int caplen,
|
|
void (*print_encap_header)(netdissect_options *ndo, const u_char *), const u_char *encap_header_arg)
|
|
{
|
|
const struct ether_header *ep;
|
|
u_int orig_length;
|
|
u_short length_type;
|
|
u_int hdrlen;
|
|
int llc_hdrlen;
|
|
struct lladdr_info src, dst;
|
|
|
|
if (caplen < ETHER_HDRLEN) {
|
|
ND_PRINT((ndo, "[|ether]"));
|
|
return (caplen);
|
|
}
|
|
if (length < ETHER_HDRLEN) {
|
|
ND_PRINT((ndo, "[|ether]"));
|
|
return (length);
|
|
}
|
|
|
|
if (ndo->ndo_eflag) {
|
|
if (print_encap_header != NULL)
|
|
(*print_encap_header)(ndo, encap_header_arg);
|
|
ether_hdr_print(ndo, p, length);
|
|
}
|
|
orig_length = length;
|
|
|
|
length -= ETHER_HDRLEN;
|
|
caplen -= ETHER_HDRLEN;
|
|
ep = (const struct ether_header *)p;
|
|
p += ETHER_HDRLEN;
|
|
hdrlen = ETHER_HDRLEN;
|
|
|
|
src.addr = ESRC(ep);
|
|
src.addr_string = etheraddr_string;
|
|
dst.addr = EDST(ep);
|
|
dst.addr_string = etheraddr_string;
|
|
length_type = EXTRACT_16BITS(&ep->ether_length_type);
|
|
|
|
recurse:
|
|
/*
|
|
* Is it (gag) an 802.3 encapsulation?
|
|
*/
|
|
if (length_type <= ETHERMTU) {
|
|
/* Try to print the LLC-layer header & higher layers */
|
|
llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
|
|
if (llc_hdrlen < 0) {
|
|
/* packet type not known, print raw packet */
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
llc_hdrlen = -llc_hdrlen;
|
|
}
|
|
hdrlen += llc_hdrlen;
|
|
} else if (length_type == ETHERTYPE_8021Q ||
|
|
length_type == ETHERTYPE_8021Q9100 ||
|
|
length_type == ETHERTYPE_8021Q9200 ||
|
|
length_type == ETHERTYPE_8021QinQ) {
|
|
/*
|
|
* Print VLAN information, and then go back and process
|
|
* the enclosed type field.
|
|
*/
|
|
if (caplen < 4) {
|
|
ND_PRINT((ndo, "[|vlan]"));
|
|
return (hdrlen + caplen);
|
|
}
|
|
if (length < 4) {
|
|
ND_PRINT((ndo, "[|vlan]"));
|
|
return (hdrlen + length);
|
|
}
|
|
if (ndo->ndo_eflag) {
|
|
uint16_t tag = EXTRACT_16BITS(p);
|
|
|
|
ND_PRINT((ndo, "%s, ", ieee8021q_tci_string(tag)));
|
|
}
|
|
|
|
length_type = EXTRACT_16BITS(p + 2);
|
|
if (ndo->ndo_eflag && length_type > ETHERMTU)
|
|
ND_PRINT((ndo, "ethertype %s, ", tok2str(ethertype_values,"0x%04x", length_type)));
|
|
p += 4;
|
|
length -= 4;
|
|
caplen -= 4;
|
|
hdrlen += 4;
|
|
goto recurse;
|
|
} else if (length_type == ETHERTYPE_JUMBO) {
|
|
/*
|
|
* Alteon jumbo frames.
|
|
* See
|
|
*
|
|
* http://tools.ietf.org/html/draft-ietf-isis-ext-eth-01
|
|
*
|
|
* which indicates that, following the type field,
|
|
* there's an LLC header and payload.
|
|
*/
|
|
/* Try to print the LLC-layer header & higher layers */
|
|
llc_hdrlen = llc_print(ndo, p, length, caplen, &src, &dst);
|
|
if (llc_hdrlen < 0) {
|
|
/* packet type not known, print raw packet */
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
llc_hdrlen = -llc_hdrlen;
|
|
}
|
|
hdrlen += llc_hdrlen;
|
|
} else {
|
|
if (ethertype_print(ndo, length_type, p, length, caplen, &src, &dst) == 0) {
|
|
/* type not known, print raw packet */
|
|
if (!ndo->ndo_eflag) {
|
|
if (print_encap_header != NULL)
|
|
(*print_encap_header)(ndo, encap_header_arg);
|
|
ether_hdr_print(ndo, (const u_char *)ep, orig_length);
|
|
}
|
|
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
}
|
|
}
|
|
return (hdrlen);
|
|
}
|
|
|
|
/*
|
|
* This is the top level routine of the printer. 'p' points
|
|
* to the ether header of the packet, 'h->len' is the length
|
|
* of the packet off the wire, and 'h->caplen' is the number
|
|
* of bytes actually captured.
|
|
*/
|
|
u_int
|
|
ether_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
|
|
const u_char *p)
|
|
{
|
|
return (ether_print(ndo, p, h->len, h->caplen, NULL, NULL));
|
|
}
|
|
|
|
/*
|
|
* This is the top level routine of the printer. 'p' points
|
|
* to the ether header of the packet, 'h->len' is the length
|
|
* of the packet off the wire, and 'h->caplen' is the number
|
|
* of bytes actually captured.
|
|
*
|
|
* This is for DLT_NETANALYZER, which has a 4-byte pseudo-header
|
|
* before the Ethernet header.
|
|
*/
|
|
u_int
|
|
netanalyzer_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
|
|
const u_char *p)
|
|
{
|
|
/*
|
|
* Fail if we don't have enough data for the Hilscher pseudo-header.
|
|
*/
|
|
if (h->len < 4 || h->caplen < 4) {
|
|
ND_PRINT((ndo, "[|netanalyzer]"));
|
|
return (h->caplen);
|
|
}
|
|
|
|
/* Skip the pseudo-header. */
|
|
return (4 + ether_print(ndo, p + 4, h->len - 4, h->caplen - 4, NULL, NULL));
|
|
}
|
|
|
|
/*
|
|
* This is the top level routine of the printer. 'p' points
|
|
* to the ether header of the packet, 'h->len' is the length
|
|
* of the packet off the wire, and 'h->caplen' is the number
|
|
* of bytes actually captured.
|
|
*
|
|
* This is for DLT_NETANALYZER_TRANSPARENT, which has a 4-byte
|
|
* pseudo-header, a 7-byte Ethernet preamble, and a 1-byte Ethernet SOF
|
|
* before the Ethernet header.
|
|
*/
|
|
u_int
|
|
netanalyzer_transparent_if_print(netdissect_options *ndo,
|
|
const struct pcap_pkthdr *h,
|
|
const u_char *p)
|
|
{
|
|
/*
|
|
* Fail if we don't have enough data for the Hilscher pseudo-header,
|
|
* preamble, and SOF.
|
|
*/
|
|
if (h->len < 12 || h->caplen < 12) {
|
|
ND_PRINT((ndo, "[|netanalyzer-transparent]"));
|
|
return (h->caplen);
|
|
}
|
|
|
|
/* Skip the pseudo-header, preamble, and SOF. */
|
|
return (12 + ether_print(ndo, p + 12, h->len - 12, h->caplen - 12, NULL, NULL));
|
|
}
|
|
|
|
/*
|
|
* Prints the packet payload, given an Ethernet type code for the payload's
|
|
* protocol.
|
|
*
|
|
* Returns non-zero if it can do so, zero if the ethertype is unknown.
|
|
*/
|
|
|
|
int
|
|
ethertype_print(netdissect_options *ndo,
|
|
u_short ether_type, const u_char *p,
|
|
u_int length, u_int caplen,
|
|
const struct lladdr_info *src, const struct lladdr_info *dst)
|
|
{
|
|
switch (ether_type) {
|
|
|
|
case ETHERTYPE_IP:
|
|
ip_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_IPV6:
|
|
ip6_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_ARP:
|
|
case ETHERTYPE_REVARP:
|
|
arp_print(ndo, p, length, caplen);
|
|
return (1);
|
|
|
|
case ETHERTYPE_DN:
|
|
decnet_print(ndo, p, length, caplen);
|
|
return (1);
|
|
|
|
case ETHERTYPE_ATALK:
|
|
if (ndo->ndo_vflag)
|
|
ND_PRINT((ndo, "et1 "));
|
|
atalk_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_AARP:
|
|
aarp_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_IPX:
|
|
ND_PRINT((ndo, "(NOV-ETHII) "));
|
|
ipx_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_ISO:
|
|
if (length == 0 || caplen == 0) {
|
|
ND_PRINT((ndo, " [|osi]"));
|
|
return (1);
|
|
}
|
|
isoclns_print(ndo, p + 1, length - 1);
|
|
return(1);
|
|
|
|
case ETHERTYPE_PPPOED:
|
|
case ETHERTYPE_PPPOES:
|
|
case ETHERTYPE_PPPOED2:
|
|
case ETHERTYPE_PPPOES2:
|
|
pppoe_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_EAPOL:
|
|
eap_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_RRCP:
|
|
rrcp_print(ndo, p, length, src, dst);
|
|
return (1);
|
|
|
|
case ETHERTYPE_PPP:
|
|
if (length) {
|
|
ND_PRINT((ndo, ": "));
|
|
ppp_print(ndo, p, length);
|
|
}
|
|
return (1);
|
|
|
|
case ETHERTYPE_MPCP:
|
|
mpcp_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_SLOW:
|
|
slow_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_CFM:
|
|
case ETHERTYPE_CFM_OLD:
|
|
cfm_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_LLDP:
|
|
lldp_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_LOOPBACK:
|
|
loopback_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_MPLS:
|
|
case ETHERTYPE_MPLS_MULTI:
|
|
mpls_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_TIPC:
|
|
tipc_print(ndo, p, length, caplen);
|
|
return (1);
|
|
|
|
case ETHERTYPE_MS_NLB_HB:
|
|
msnlb_print(ndo, p);
|
|
return (1);
|
|
|
|
case ETHERTYPE_GEONET_OLD:
|
|
case ETHERTYPE_GEONET:
|
|
geonet_print(ndo, p, length, src);
|
|
return (1);
|
|
|
|
case ETHERTYPE_CALM_FAST:
|
|
calm_fast_print(ndo, p, length, src);
|
|
return (1);
|
|
|
|
case ETHERTYPE_AOE:
|
|
aoe_print(ndo, p, length);
|
|
return (1);
|
|
|
|
case ETHERTYPE_MEDSA:
|
|
medsa_print(ndo, p, length, caplen, src, dst);
|
|
return (1);
|
|
|
|
case ETHERTYPE_LAT:
|
|
case ETHERTYPE_SCA:
|
|
case ETHERTYPE_MOPRC:
|
|
case ETHERTYPE_MOPDL:
|
|
case ETHERTYPE_IEEE1905_1:
|
|
/* default_print for now */
|
|
default:
|
|
return (0);
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|
|
|