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
174 lines
5.2 KiB
C
174 lines
5.2 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: Apple's DLT_PKTAP printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "extract.h"
|
|
|
|
#ifdef DLT_PKTAP
|
|
|
|
/*
|
|
* XXX - these are little-endian in the captures I've seen, but Apple
|
|
* no longer make any big-endian machines (Macs use x86, iOS machines
|
|
* use ARM and run it little-endian), so that might be by definition
|
|
* or they might be host-endian.
|
|
*
|
|
* If a big-endian PKTAP file ever shows up, and it comes from a
|
|
* big-endian machine, presumably these are host-endian, and we need
|
|
* to just fetch the fields directly in tcpdump but byte-swap them
|
|
* to host byte order in libpcap.
|
|
*/
|
|
typedef struct pktap_header {
|
|
uint32_t pkt_len; /* length of pktap header */
|
|
uint32_t pkt_rectype; /* type of record */
|
|
uint32_t pkt_dlt; /* DLT type of this packet */
|
|
char pkt_ifname[24]; /* interface name */
|
|
uint32_t pkt_flags;
|
|
uint32_t pkt_pfamily; /* "protocol family" */
|
|
uint32_t pkt_llhdrlen; /* link-layer header length? */
|
|
uint32_t pkt_lltrlrlen; /* link-layer trailer length? */
|
|
uint32_t pkt_pid; /* process ID */
|
|
char pkt_cmdname[20]; /* command name */
|
|
uint32_t pkt_svc_class; /* "service class" */
|
|
uint16_t pkt_iftype; /* "interface type" */
|
|
uint16_t pkt_ifunit; /* unit number of interface? */
|
|
uint32_t pkt_epid; /* "effective process ID" */
|
|
char pkt_ecmdname[20]; /* "effective command name" */
|
|
} pktap_header_t;
|
|
|
|
/*
|
|
* Record types.
|
|
*/
|
|
#define PKT_REC_NONE 0 /* nothing follows the header */
|
|
#define PKT_REC_PACKET 1 /* a packet follows the header */
|
|
|
|
static inline void
|
|
pktap_header_print(netdissect_options *ndo, const u_char *bp, u_int length)
|
|
{
|
|
const pktap_header_t *hdr;
|
|
uint32_t dlt, hdrlen;
|
|
const char *dltname;
|
|
|
|
hdr = (const pktap_header_t *)bp;
|
|
|
|
dlt = EXTRACT_LE_32BITS(&hdr->pkt_dlt);
|
|
hdrlen = EXTRACT_LE_32BITS(&hdr->pkt_len);
|
|
dltname = pcap_datalink_val_to_name(dlt);
|
|
if (!ndo->ndo_qflag) {
|
|
ND_PRINT((ndo,"DLT %s (%d) len %d",
|
|
(dltname != NULL ? dltname : "UNKNOWN"), dlt, hdrlen));
|
|
} else {
|
|
ND_PRINT((ndo,"%s", (dltname != NULL ? dltname : "UNKNOWN")));
|
|
}
|
|
|
|
ND_PRINT((ndo, ", length %u: ", length));
|
|
}
|
|
|
|
/*
|
|
* This is the top level routine of the printer. 'p' points
|
|
* to the ether header of the packet, 'h->ts' is the timestamp,
|
|
* 'h->len' is the length of the packet off the wire, and 'h->caplen'
|
|
* is the number of bytes actually captured.
|
|
*/
|
|
u_int
|
|
pktap_if_print(netdissect_options *ndo,
|
|
const struct pcap_pkthdr *h, const u_char *p)
|
|
{
|
|
uint32_t dlt, hdrlen, rectype;
|
|
u_int caplen = h->caplen;
|
|
u_int length = h->len;
|
|
if_printer printer;
|
|
const pktap_header_t *hdr;
|
|
struct pcap_pkthdr nhdr;
|
|
|
|
if (caplen < sizeof(pktap_header_t) || length < sizeof(pktap_header_t)) {
|
|
ND_PRINT((ndo, "[|pktap]"));
|
|
return (0);
|
|
}
|
|
hdr = (const pktap_header_t *)p;
|
|
dlt = EXTRACT_LE_32BITS(&hdr->pkt_dlt);
|
|
hdrlen = EXTRACT_LE_32BITS(&hdr->pkt_len);
|
|
if (hdrlen < sizeof(pktap_header_t)) {
|
|
/*
|
|
* Claimed header length < structure length.
|
|
* XXX - does this just mean some fields aren't
|
|
* being supplied, or is it truly an error (i.e.,
|
|
* is the length supplied so that the header can
|
|
* be expanded in the future)?
|
|
*/
|
|
ND_PRINT((ndo, "[|pktap]"));
|
|
return (0);
|
|
}
|
|
if (caplen < hdrlen || length < hdrlen) {
|
|
ND_PRINT((ndo, "[|pktap]"));
|
|
return (hdrlen);
|
|
}
|
|
|
|
if (ndo->ndo_eflag)
|
|
pktap_header_print(ndo, p, length);
|
|
|
|
length -= hdrlen;
|
|
caplen -= hdrlen;
|
|
p += hdrlen;
|
|
|
|
rectype = EXTRACT_LE_32BITS(&hdr->pkt_rectype);
|
|
switch (rectype) {
|
|
|
|
case PKT_REC_NONE:
|
|
ND_PRINT((ndo, "no data"));
|
|
break;
|
|
|
|
case PKT_REC_PACKET:
|
|
if ((printer = lookup_printer(dlt)) != NULL) {
|
|
nhdr = *h;
|
|
nhdr.caplen = caplen;
|
|
nhdr.len = length;
|
|
hdrlen += printer(ndo, &nhdr, p);
|
|
} else {
|
|
if (!ndo->ndo_eflag)
|
|
pktap_header_print(ndo, (const u_char *)hdr,
|
|
length + hdrlen);
|
|
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
}
|
|
break;
|
|
}
|
|
|
|
return (hdrlen);
|
|
}
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|
|
|
|
#endif /* DLT_PKTAP */
|