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
148 lines
4.0 KiB
C
148 lines
4.0 KiB
C
/*
|
|
* Copyright (c) 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: BSD loopback device printer */
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include <netdissect-stdinc.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include "netdissect.h"
|
|
#include "af.h"
|
|
|
|
/*
|
|
* The DLT_NULL packet header is 4 bytes long. It contains a host-byte-order
|
|
* 32-bit integer that specifies the family, e.g. AF_INET.
|
|
*
|
|
* Note here that "host" refers to the host on which the packets were
|
|
* captured; that isn't necessarily *this* host.
|
|
*
|
|
* The OpenBSD DLT_LOOP packet header is the same, except that the integer
|
|
* is in network byte order.
|
|
*/
|
|
#define NULL_HDRLEN 4
|
|
|
|
/*
|
|
* Byte-swap a 32-bit number.
|
|
* ("htonl()" or "ntohl()" won't work - we want to byte-swap even on
|
|
* big-endian platforms.)
|
|
*/
|
|
#define SWAPLONG(y) \
|
|
((((y)&0xff)<<24) | (((y)&0xff00)<<8) | (((y)&0xff0000)>>8) | (((y)>>24)&0xff))
|
|
|
|
static inline void
|
|
null_hdr_print(netdissect_options *ndo, u_int family, u_int length)
|
|
{
|
|
if (!ndo->ndo_qflag) {
|
|
ND_PRINT((ndo, "AF %s (%u)",
|
|
tok2str(bsd_af_values,"Unknown",family),family));
|
|
} else {
|
|
ND_PRINT((ndo, "%s",
|
|
tok2str(bsd_af_values,"Unknown AF %u",family)));
|
|
}
|
|
|
|
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
|
|
null_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
|
|
{
|
|
u_int length = h->len;
|
|
u_int caplen = h->caplen;
|
|
u_int family;
|
|
|
|
if (caplen < NULL_HDRLEN) {
|
|
ND_PRINT((ndo, "[|null]"));
|
|
return (NULL_HDRLEN);
|
|
}
|
|
|
|
memcpy((char *)&family, (const char *)p, sizeof(family));
|
|
|
|
/*
|
|
* This isn't necessarily in our host byte order; if this is
|
|
* a DLT_LOOP capture, it's in network byte order, and if
|
|
* this is a DLT_NULL capture from a machine with the opposite
|
|
* byte-order, it's in the opposite byte order from ours.
|
|
*
|
|
* If the upper 16 bits aren't all zero, assume it's byte-swapped.
|
|
*/
|
|
if ((family & 0xFFFF0000) != 0)
|
|
family = SWAPLONG(family);
|
|
|
|
if (ndo->ndo_eflag)
|
|
null_hdr_print(ndo, family, length);
|
|
|
|
length -= NULL_HDRLEN;
|
|
caplen -= NULL_HDRLEN;
|
|
p += NULL_HDRLEN;
|
|
|
|
switch (family) {
|
|
|
|
case BSD_AFNUM_INET:
|
|
ip_print(ndo, p, length);
|
|
break;
|
|
|
|
case BSD_AFNUM_INET6_BSD:
|
|
case BSD_AFNUM_INET6_FREEBSD:
|
|
case BSD_AFNUM_INET6_DARWIN:
|
|
ip6_print(ndo, p, length);
|
|
break;
|
|
|
|
case BSD_AFNUM_ISO:
|
|
isoclns_print(ndo, p, length);
|
|
break;
|
|
|
|
case BSD_AFNUM_APPLETALK:
|
|
atalk_print(ndo, p, length);
|
|
break;
|
|
|
|
case BSD_AFNUM_IPX:
|
|
ipx_print(ndo, p, length);
|
|
break;
|
|
|
|
default:
|
|
/* unknown AF_ value */
|
|
if (!ndo->ndo_eflag)
|
|
null_hdr_print(ndo, family, length + NULL_HDRLEN);
|
|
if (!ndo->ndo_suppress_default_print)
|
|
ND_DEFAULTPRINT(p, caplen);
|
|
}
|
|
|
|
return (NULL_HDRLEN);
|
|
}
|
|
|
|
/*
|
|
* Local Variables:
|
|
* c-style: whitesmith
|
|
* c-basic-offset: 8
|
|
* End:
|
|
*/
|